Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r330 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-26 22:00:45
|
Author: M0E.lnx
Date: Wed Nov 26 13:58:57 2008
New Revision: 330
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FMain.class
branches/iVL/FMain.form
branches/iVL/FrmDiskPart.class
branches/iVL/FrmNetConf.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmRootPass.class
branches/iVL/FrmSummary.class
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUsrPkgSel.class
branches/iVL/MdlCore.module
branches/iVL/MdlLilo.module
branches/iVL/MdlNetConf.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlPkgSel.module
branches/iVL/MdlPkgSelNew.module
branches/iVL/MdlWinDrives.module
Log:
Added status indicator
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Nov 26 13:58:57 2008
@@ -14,95 +14,95 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:195
+#: FMain.class:196
msgid "Restart"
msgstr ""
-#: FMain.class:222
+#: FMain.class:223
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:223
+#: FMain.class:224
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:230
+#: FMain.class:231
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:243
+#: FMain.class:244
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "Yes"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "No"
msgstr ""
-#: FMain.class:276
+#: FMain.class:277
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:280
+#: FMain.class:281
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:295
+#: FMain.class:296
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:295
+#: FMain.class:296
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:354
+#: FMain.class:348
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:356
+#: FMain.class:350
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:356
+#: FMain.class:350
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:370
+#: FMain.class:364
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:459
+#: FMain.class:458
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:784
+#: FMain.class:797
msgid "Back"
msgstr ""
-#: FMain.class:796
+#: FMain.class:809
msgid "Exit Installation"
msgstr ""
-#: FMain.class:808
+#: FMain.class:821
msgid "Next"
msgstr ""
-#: FMain.class:822
+#: FMain.class:835
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Nov 26 13:58:57 2008
@@ -14,7 +14,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmDiskPart.class:115
+#: FrmDiskPart.class:58
+msgid "When finished making changes, exit the partitioning application to
continue ..."
+msgstr ""
+
+#: FrmDiskPart.class:117
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Nov 26 13:58:57 2008
@@ -26,6 +26,10 @@
msgid "Full"
msgstr ""
+#: FrmSummary.class:37
+msgid "Preparing Installation Summary ... Please wait"
+msgstr ""
+
#: FrmSummary.class:39
msgid "Partition"
msgstr ""
@@ -51,7 +55,7 @@
msgstr ""
#: FrmSummary.class:58
-msgid "Do Not Format"
+msgid "Do not Format"
msgstr ""
#: FrmSummary.class:59
@@ -70,27 +74,27 @@
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:175
+#: FrmSummary.class:174
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:184
+#: FrmSummary.class:183
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:211
+#: FrmSummary.class:210
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:287
+#: FrmSummary.class:286
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:297
+#: FrmSummary.class:296
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:307
+#: FrmSummary.class:306
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Nov 26 13:58:57 2008
@@ -14,99 +14,103 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlCore.module:204
+#: MdlCore.module:28
+msgid "Working ... Please Wait"
+msgstr ""
+
+#: MdlCore.module:221
msgid "Scanning system for installable media. Please wait ..."
msgstr ""
-#: MdlCore.module:220
+#: MdlCore.module:237
msgid "No Installable Media Found"
msgstr ""
-#: MdlCore.module:222
+#: MdlCore.module:239
msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
msgstr ""
-#: MdlCore.module:222
+#: MdlCore.module:239
msgid "installation CD and click"
msgstr ""
-#: MdlCore.module:222
+#: MdlCore.module:239
msgid "to try again"
msgstr ""
-#: MdlCore.module:383
+#: MdlCore.module:400
msgid "Build Date: "
msgstr ""
-#: MdlCore.module:383
+#: MdlCore.module:400
msgid "MINIMUM REQUIREMENTS"
msgstr ""
-#: MdlCore.module:388
+#: MdlCore.module:405
msgid "Setup is unable to find SETUP.CONF in your install media. This
could be symptoms of a bad burn or a bad ISO"
msgstr ""
-#: MdlCore.module:461
+#: MdlCore.module:478
msgid "Cannot find SETUP.CONF"
msgstr ""
-#: MdlCore.module:469
+#: MdlCore.module:486
msgid "Preparation"
msgstr ""
-#: MdlCore.module:470
+#: MdlCore.module:487
msgid "Language Selection"
msgstr ""
-#: MdlCore.module:471
+#: MdlCore.module:488
msgid "Find installation media"
msgstr ""
-#: MdlCore.module:472
+#: MdlCore.module:489
msgid "Disk Partitioning"
msgstr ""
-#: MdlCore.module:473
+#: MdlCore.module:490
msgid "Software Selection"
msgstr ""
-#: MdlCore.module:475
+#: MdlCore.module:492
msgid "Installation"
msgstr ""
-#: MdlCore.module:476
+#: MdlCore.module:493
msgid "Installation Summary"
msgstr ""
-#: MdlCore.module:478
+#: MdlCore.module:495
msgid "Install Operating System"
msgstr ""
-#: MdlCore.module:479
+#: MdlCore.module:496
msgid "System Configuration"
msgstr ""
-#: MdlCore.module:480
+#: MdlCore.module:497
msgid "Boot Menu Options"
msgstr ""
-#: MdlCore.module:481
+#: MdlCore.module:498
msgid "Regional Settings"
msgstr ""
-#: MdlCore.module:482
+#: MdlCore.module:499
msgid "System Administrator"
msgstr ""
-#: MdlCore.module:483
+#: MdlCore.module:500
msgid "User Accounts"
msgstr ""
-#: MdlCore.module:484
+#: MdlCore.module:501
msgid "Network Configuration"
msgstr ""
-#: MdlCore.module:485
+#: MdlCore.module:502
msgid "Final Hardware Configuration"
msgstr ""
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Nov 26 13:58:57 2008
@@ -30,7 +30,7 @@
msgid "Do not mount"
msgstr ""
-#: MdlWinDrives.module:193
+#: MdlWinDrives.module:141
msgid "No Windows partitions detected"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Nov 26 13:58:57 2008
@@ -189,6 +189,7 @@
DIM sLang AS String
'tvPlan.Refresh()
+ 'FMain.tlStatus.Text = ("Working ... Please wait")
FMain.btnext.Enabled = FALSE
@@ -314,14 +315,7 @@
END SELECT
- ' ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic
- ' .tvPlan["Conf4"].Selected = TRUE
- ' END WITH FrmCurr.Hide
- ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic
- ' .tvPlan["Conf4"].Selected = TRUE
- ' END WITH
+
frmNext.Reparent(FrmCurr.Parent)
frmNext.Show
@@ -348,7 +342,7 @@
' The next form is defined from the radio buttons in Frm
PartScheme. But let's see if we can display some status text
'FMain.MovieBox1.Refresh
-
+ MdlCore.WARN_STATUS("")
WITH FrmPartScheme
IF .rbEditPartitions.Value = TRUE THEN
.tlChoiceExp.text = .tlChoiceExp.text & gb.NewLine &
gb.NewLine & "<b><br><br>" & ("Please wait while setup attampts to run the
partitioning utility") & "</b>"
@@ -363,7 +357,7 @@
'FMain.MovieBox1.Playing = TRUE
WAIT
-
+ MdlCore.warn_status_off()
CASE "FrmPartSel"
IF NOT ClsPartSel.sRoot OR ClsPartSel.sRoot = "" THEN
@@ -372,6 +366,7 @@
RETURN
ELSE
' set the partition types
+ MdlCore.WARN_STATUS("")
MdlPartSel.SET_LINUX_PARTITION_TYPES()
IF ClsPartSel.bDoWin = TRUE THEN
frmNext = FrmWinDrives
@@ -381,16 +376,19 @@
END IF
END IF
+ MdlCore.warn_status_off()
CASE "FrmPkgSel"
'here we check what kind of install it is, simple or custom
'IF FrmPkgSel.rbCustom.Value = TRUE THEN
-
+ ' MdlCore.WARN_STATUS(("Reading available software
selection ... Please wait"))
IF ClsPkgSel.bCustom = TRUE THEN
'get the list of selected bulks only
'MdlPkgSel.GET_USER_BULK_SELECTION()
'frmNext = FrmPkgsel2
+
frmNext = FrmUsrPkgSel
+
ELSE
' Going for simple install. Now we are ready to summarize
' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '
MdlSummarize.SUMMARIZE_INSTALL
@@ -400,6 +398,7 @@
CASE "FrmPkgsel2" ', "FrmUsrPkgSel"
' summarize the build
+ 'MdlCore.WARN_STATUS(("Reading available software selection ...
Please wait"))
' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '
MdlSummarize.SUMMARIZE_INSTALL
frmNext = FrmSummary
'frmNext = install
@@ -577,6 +576,7 @@
END IF
tvPlan.Refresh()
ClsGlobal.sBackNav.Add(FrmCurr)
+'FMain.tlStatus.Text = ""
END
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Wed Nov 26 13:58:57 2008
@@ -20,37 +20,46 @@
}
}
{ Panel2 Panel
- MoveScaled(3,9,94,60)
+ MoveScaled(1,9,94,62)
Expand = True
Arrangement = Arrange.Horizontal
{ SidePanel1 SidePanel
- MoveScaled(1,1,26,63)
+ MoveScaled(0,0,26,63)
Background = Color.Background
Arrangement = Arrange.Vertical
Orientation = Align.Left
{ tvPlan TreeView
- MoveScaled(1,0,23,56)
+ MoveScaled(1,0,23,47)
Expand = True
Mode = Select.None
}
+ { HPanel1 HPanel
+ MoveScaled(2,49,21,4)
+ }
{ HBox2 HBox
- MoveScaled(1,56,72,6.7143)
+ MoveScaled(0,54,72,6.7143)
}
}
{ PnlRight Panel
- MoveScaled(31,4,57,48)
+ MoveScaled(31,1,57,48)
Expand = True
Arrangement = Arrange.Vertical
Border = Border.Etched
{ pnlwinhost Workspace
- MoveScaled(5,2,30,26)
+ MoveScaled(6,4,30,26)
Expand = True
}
{ HBox4 HBox
- MoveScaled(2,41,28,2)
+ MoveScaled(3,39,28,2)
+ { tlStatus TextLabel
+ MoveScaled(0,0,21,3)
+ Expand = True
+ Text = ("")
+ Alignment = Align.Center
+ }
}
{ HBox1 HBox
- MoveScaled(2,43,53,3)
+ MoveScaled(3,41,53,3)
{ btback Button
MoveScaled(0,0,8,3)
Expand = True
@@ -79,7 +88,7 @@
}
}
{ HBox3 HBox
- MoveScaled(7,46,12,2)
+ MoveScaled(8,44,12,2)
}
}
}
Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class (original)
+++ branches/iVL/FrmDiskPart.class Wed Nov 26 13:58:57 2008
@@ -55,6 +55,7 @@
FMain.btback.ForeColor = Color.Gray
FMain.btQuit.Enabled = FALSE
FMain.btQuit.ForeColor = Color.Gray
+ MdlCore.WARN_STATUS(("When finished making changes, exit the
partitioning application to continue ..."))
END
@@ -67,6 +68,7 @@
FrmDiskPart.tlBanner.Refresh
FrmDiskPart.tlBanner.Adjust
'Message("Exiting GParted")
+ MdlCore.warn_status_off()
WAIT 1
bReboot = MdlSetup.CHECK_IF_REBOOT_NEEDED()
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Wed Nov 26 13:58:57 2008
@@ -69,7 +69,7 @@
NEXT
' ME.frmNetDevices.Text = Space(1) & ("Network Interfaces") & Space(1)
FMain.btnext.Enabled = TRUE
-
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Wed Nov 26 13:58:57 2008
@@ -35,7 +35,7 @@
END
PUBLIC SUB Form_Open()
-
+ MdlCore.WARN_STATUS("")
ME.tlBanner.text = "<h3>" & ME.tlBanner.text & "</h3>"
FMain.FrmCurr = ME
FMain.tvPlan["Prep2"].Selected = TRUE
@@ -50,7 +50,7 @@
.rbUseExisting.Width =
MdlObjSizer.get_object_width(.rbUseExisting.Text) + 24
END WITH
ME.rbUseExisting_Click()
-
+MdlCore.warn_status_off()
END
PUBLIC SUB rbUseExisting_Click()
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Wed Nov 26 13:58:57 2008
@@ -44,10 +44,10 @@
.Columns[1].Width = 120
.Columns[2].Width = 350
END WITH
-
+MdlCore.WARN_STATUS("")
ME.FILL_IN_BULK_LIST()
FMain.btnext.Enabled = TRUE
-
+MdlCore.warn_status_off()
END
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Wed Nov 26 13:58:57 2008
@@ -32,16 +32,13 @@
PUBLIC SUB Button1_Click()
+
+ MdlCore.WARN_STATUS("")
IF ME.tbPasswd1.Text = "" THEN
Message(("Enter a Password for root."))
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
- 'Message("chroot /mnt/target /sbin/passwdx root " &
ME.tbPasswd1.Text)
- ' bind mounting necessary here
- 'SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT
- 'SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc"
WAIT
- 'SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
- 'SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
+
SHELL "chroot /mnt/target /sbin/passwdx root " & ME.tbPasswd1.Text
WAIT
'Message("Root password Set.")
ME.tbPasswd1.Clear
@@ -53,10 +50,8 @@
ME.tbPasswd1.SetFocus
ENDIF
ENDIF
- 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "sys" WAIT
- 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT
- 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
- 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT
+
+ MdlCore.warn_status_off()
END
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Wed Nov 26 13:58:57 2008
@@ -34,7 +34,7 @@
DIM tl AS TextLabel
DIM bForm AS String
DIM sPart, sMountPnt, sFsType, sSize AS String
-
+ MdlCore.WARN_STATUS(("Preparing Installation Summary ... Please wait"))
ME.GridView1.Columns.count = 5
ME.GridView1.Columns[0].text = ("Partition")
ME.GridView1.Columns[0].Width =
MdlObjSizer.get_object_width("/dev/hda1***")
@@ -55,7 +55,7 @@
sMountPnt = cb.Text
FOR EACH cb1 IN MdlPartSel.oFsTypes
IF cb1.tag = cb.tag THEN sFsType = cb1.Text
- IF cb1.Text <> ("Do Not Format") THEN
+ IF cb1.Text <> ("Do not Format") THEN
bForm = ("Yes")
ELSE
bForm = ("No")
@@ -158,8 +158,7 @@
' MAYBE CREATE A SEPARATED ROW BY SETTING IT'S BG
COLOR TO SOMETHING BRIGHT AND BOLD FORE FONTS
-
-
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Nov 26 13:58:57 2008
@@ -89,6 +89,7 @@
DIM tl AS TextLabel
'DIM tly AS Integer
+MdlCore.WARN_STATUS(("Creating user account ... Please wait"))
' increment the number of user accounts created
INC MdlUsrAdd.iUsrAccts
@@ -138,14 +139,7 @@
NEXT
sGroups = Right(sGroups, Len(sGroups) - 1)
'Message(sGroups)
- 'need to do some binding for this to work
- '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"
-
+
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
PRINT "Creating new user group"
@@ -164,8 +158,7 @@
SHELL "chroot /mnt/target /sbin/passwdx " & ME.tbUsername.Text &
Space(1) & ME.tbPasswd1.Text WAIT
'IF IsDir(sPicdir) THEN
IF bUsePic.Value = TRUE THEN
- 'SHELL "cd " & sPicdir & " && ln -s root1.png
root.face.icon" ' This needs to go somewhere else
- 'SHELL "cd " & sPicdir & " ; ln -s default3.png " &
ME.tbUsername.Text & ".face.icon"
+
'this next line is for kdm
SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
'the next lines are for gdm
@@ -200,15 +193,10 @@
ENDIF
ENDIF
ENDIF
- 'SHELL "umount /mnt/target/dev" WAIT
- 'SHELL "umount /mnt/target/proc" WAIT
- 'SHELL "umount /mnt/target/tmp" WAIT
- 'SHELL "umount /mnt/target/sys" WAIT
-
-'ME.LIST_NEW_USER_ACCOUNT()
+
ME.LstUsers.Visible = TRUE
ME.pbUsrPic.Visible = TRUE
-
+ MdlCore.warn_status_off()
END
PUBLIC SUB LIST_NEW_USER_ACCOUNT()
Modified: branches/iVL/FrmUsrPkgSel.class
==============================================================================
--- branches/iVL/FrmUsrPkgSel.class (original)
+++ branches/iVL/FrmUsrPkgSel.class Wed Nov 26 13:58:57 2008
@@ -23,8 +23,10 @@
.Columns[5].Resizable = FALSE
END WITH
+ MdlCore.WARN_STATUS("")
ME.LIST_PACKAGES
FMain.btnext.Enabled = TRUE
+'MdlCore.warn_status_off()
END
PUBLIC SUB LIST_PACKAGES()
@@ -35,6 +37,8 @@
DIM i, ii AS Integer
DIM sLine, sPkg, sDesc, sSize, sLoc AS String
+ MdlCore.WARN_STATUS(("Reading available software selection ... Please
wait"))
+
sPACKAGES = Split(sFile, "\n")
FOR i = 0 TO sPACKAGES.count - 1
@@ -80,7 +84,7 @@
-
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Wed Nov 26 13:58:57 2008
@@ -24,12 +24,27 @@
PUBLIC iLeftWidth AS Integer
PUBLIC frmInit AS Form
+PUBLIC FUNCTION WARN_STATUS(sText AS String)
+ IF NOT sText OR IF sText = "" THEN sText = ("Working ... Please Wait")
+ fmain.tlStatus.Text = (sText)
+
+END
+PUBLIC SUB warn_status_off()
+
+ fmain.tlStatus.Text = ""
+
+END
+
+
PUBLIC SUB FIND_ISO_ON_DRIVE(sDrive AS String)
DIM sISOList AS String[]
DIM sResults, sISO AS String
DIM i AS Integer
+
+ ME.WARN_STATUS("")
+
'Message(ClsGlobal.sSourceMnt)
SHELL "umount " & ClsGlobal.sSourceMnt WAIT
SHELL "mount " & sDrive & Space(1) & ClsGlobal.sSourceMnt WAIT
@@ -60,7 +75,7 @@
NEXT
SHELL "umount " & ClsGlobal.sSourceMnt WAIT
-
+ ME.warn_status_off
END
@@ -73,6 +88,7 @@
DIM i AS Integer
DIM sPartition AS String
+ME.WARN_STATUS("")
SHELL "probepart | grep -v -i \'swap\' | grep -v -i \'ext\' |grep
\'/dev\'| grep -v \'Disk\'| cut -f 1 -d \' \'" TO sResults
'Message(sResults)
@@ -87,7 +103,7 @@
NEXT
-
+ ME.warn_status_off
END
@@ -102,7 +118,7 @@
DIM sDump AS String
DIM i AS Integer
-
+ ME.WARN_STATUS("")
'ClsGlobal.sSourceMnt = "/mnt/source"
sMountPoint = ClsGlobal.sSourceMnt
@@ -142,7 +158,7 @@
MdlCore.unlock_gui()
fmain.btback.Enabled = FALSE
fmain.btback.ForeColor = Color.Gray
-
+ ME.warn_status_off
END
@@ -201,6 +217,7 @@
'RETURN
+ME.WARN_STATUS("")
FrmSelISO.tlDistroDesc.Text = "<b>" & ("Scanning system for installable
media. Please wait ...") & "</b>"
IF Exist(ClsGlobal.sSourceMnt) = FALSE THEN TRY MKDIR ClsGlobal.sSourceMnt
@@ -227,7 +244,7 @@
FMain.btnext.ForeColor = Color.Black
END IF
-
+ME.warn_status_off
' FMain.tvPlan["Prep0"].Selected
END
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Nov 26 13:58:57 2008
@@ -30,13 +30,14 @@
PUBLIC FUNCTION TRIGGER_LILO_SETUP() AS Integer
DIM IRET AS Integer
+ MdlCore.WARN_STATUS("")
ME.GENERATE_LILO_DOT_CONF ' Generates and write lilo.conf
ME.COPY_KERNELS_AND_INITRDS ' copy kernels and initrs to the right place
'Moved binding to FMain.class right after packages finish installing.
'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
IRET = MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
RETURN IRET
-
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Wed Nov 26 13:58:57 2008
@@ -57,6 +57,7 @@
DIM sApDump AS String
'DIM iwifix, iwifiy, iwifiboxwidth AS Integer
+ MdlCore.WARN_STATUS(("Probing your networking hardware ... Please
wait"))
'initiate the arrays
objCombos = NEW Object[]
@@ -340,6 +341,7 @@
IF ERROR THEN Message(Error.text & gb.newline & Error.where)
KILL "/tmp/iwdump"
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Wed Nov 26 13:58:57 2008
@@ -44,7 +44,7 @@
DIM ii AS Integer
DIM sDrive, sPartNo, sBlank AS String
-
+ MdlCore.WARN_STATUS("")
' fire up the arrays
oFsTypes = NEW Object[]
@@ -261,7 +261,7 @@
-
+MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlPkgSel.module
==============================================================================
--- branches/iVL/MdlPkgSel.module (original)
+++ branches/iVL/MdlPkgSel.module Wed Nov 26 13:58:57 2008
@@ -32,7 +32,7 @@
'File.Save(Temp("SETUP.CONF"), DConv(File.Load(ClsGlobal.sSourceMnt
&/ "veclinux" &/ "SETUP.CONF")))
'Message(File.Load(Temp("SETUP.CONF")))
Bulks = NEW Object[]
-
+ MdlCore.WARN_STATUS("")
sFIle = Split(File.Load(Temp("SETUP.CONF")), gb.NewLine)
FOR i = 0 TO sFIle.count - 1
sLine = Trim(sFIle[i])
@@ -62,7 +62,7 @@
END IF
END IF
NEXT
-
+ MdlCore.warn_status_off()
END
@@ -107,105 +107,6 @@
END IF
NEXT
-
-END
-
-
-' ' ' PUBLIC SUB Packages_click()
-' ' '
-' ' '
-' ' '
-' ' ' IF ClsPkgSel.arrPkgs THEN
-' ' ' ClsPkgSel.arrPkgs.Clear
-' ' ' END IF
-' ' ' ME.GET_USER_PKG_SELECTION()
-' ' '
-' ' ' ' Now display a description here
-' ' '
-' ' '
-' ' ' 'PRINT sDump
-' ' '
-' ' ' END
-
-PUBLIC SUB Packages_enter()
-
-DIM sSearch AS String
-DIM sDump AS String
-DIM sArr AS String[]
-DIM i AS Integer
-DIM sDesc AS String
-
-
- sSearch = Right(LAST.tag, Len(LAST.tag) - InStr(LAST.tag, "/"))
- 'Message(sSearch)
- SHELL "pkgname " & sSearch TO sSearch
- sSearch = Trim(sSearch)
-
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT |
grep -m 8 \'" & sSearch & ":\' | cut -f2- -d \':\'" TO sDump
- sArr = Split(sDump, "\n")
- FOR i = 0 TO sArr.count - 1
- IF InStr(sArr[i], ":") = FALSE THEN
- sDesc = sDesc & sArr[i]
- END IF
- NEXT
-
- sDesc = Trim(sDesc)
- WITH FrmPkgsel2.tlPkgDesc
- .Move(4, 4, .Parent.Width - (.left * 2), .Parent.Height - (.top * 2))
- .text = Trim(sDesc)
- .Alignment = Align.Normal
- 'FrmPkgsel2.tlPkgDesc.Text = sDesc
- END WITH
-
-
-END
-
-
-
-
-
-' PUBLIC SUB OptBulks_click()
-'
-' IF ClsPkgSel.arrBulks THEN
-' ClsPkgSel.arrBulks.Clear
-' END IF
-' ME.GET_USER_BULK_SELECTION
-'
-' PRINT LAST.tag
-'
-' END
-' '
-' '
-PUBLIC SUB GET_USER_BULK_SELECTION()
-
- DIM cb AS CheckBox
- DIM sList AS String
- DIM sItem AS String
- DIM i AS Integer
- ' start the list
- ClsPkgSel.arrBulks = NEW String[]
- FOR EACH cb IN ME.Bulks
- IF cb.Value = TRUE THEN
- ClsPkgSel.arrBulks.Add(cb.tag)
- END IF
- NEXT ' just store them to the array for now. We will read the array at
install time
-
-
-END
-
-PUBLIC SUB GET_USER_PKG_SELECTION()
-
- DIM cb AS CheckBox
- DIM sList, sItem AS String
- DIM i AS Integer
- ' simply get the list of packages into the array, and we will read the
array while installing packages.
- ClsPkgSel.arrPkgs = NEW String[]
- FOR EACH cb IN ME.Pkgs
- IF cb.value = TRUE THEN
- ClsPkgSel.arrPkgs.Add(cb.Tag)
- END IF
- NEXT
-
END
Modified: branches/iVL/MdlPkgSelNew.module
==============================================================================
--- branches/iVL/MdlPkgSelNew.module (original)
+++ branches/iVL/MdlPkgSelNew.module Wed Nov 26 13:58:57 2008
@@ -1,5 +1,21 @@
' Gambas module file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' 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 SUB GET_LIST_OF_SELECTED_PACKAGES()
DIM i AS Integer
DIM sList AS String
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Wed Nov 26 13:58:57 2008
@@ -39,7 +39,7 @@
x = 4
y = 8
-
+MdlCore.WARN_STATUS("")
ME.oWMntPoints = NEW Object[]
ME.tlWnParts = NEW Object[]
@@ -131,60 +131,8 @@
y = y + tl.Height + 4
NEXT
- ' ' ' now do ntfs partitions the same way
- ' ' sDump1 = ""
- ' ' 'sDisks.Clear
- ' ' 'SHELL "probepart | grep -i ntfs | cut -f 1 -d \' \'" TO
sDump1\
- ' ' SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT16|FAT32|HPFS|NTFS|
Win)\' | cut -f 1 -d \' \'" TO sDump1
- ' ' sDump1 = Trim(sDump1)
- ' ' wintfs = Split(sDump1, "\n")
- ' ' FOR i = 0 TO wintfs.Count - 1
- ' ' sPartNo = Right(wintfs[i], Len(wintfs[i]) -
Len("/dev/hda"))
- ' ' IF Len(sPartNo) > 1 THEN
- ' ' sBlank = ""
- ' ' ELSE
- ' ' sBlank = " "
- ' ' END IF
- ' ' 'we need to know if this fails. it fails on a test machine
here with "bad partition table"
- ' ' SHELL "export s=$(parted " & Left(wintfs[i],
Len("/dev/hda")) & " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s |
cut -f 4 -d \' \'" TO sPartsize
- ' ' 'IF sPartSize.len = 0 THEN
- ' ' IF Len(sPartsize) = 0 THEN
- ' ' sPartSize = "UNKNOWN"
- ' ' ENDIF
- ' ' tl = NEW TextLabel(FrmWinDrives.svWinDrives)
- ' ' WITH tl
- ' ' .y = y
- ' ' .x = x
- ' ' .text = wintfs[i] & " [ " & sPartsize & " ]"
- ' ' .Width = 200
- ' ' .Height = 21
- ' ' .tag = wintfs[i]
- ' ' .Alignment = Align.Normal
- ' ' END WITH
- ' ' ME.tlWnParts.Add(tl)
- ' ' cb = NEW ComboBox(FrmWinDrives.svWinDrives)
- ' ' WITH cb
- ' ' .x = cbx
- ' ' .y = tl.top
- ' ' .Width = tl.Width * 0.75
- ' ' .Height = 21
- ' ' .tag = wintfs[i]
- ' ' .Add("/mnt" &/ Right(.tag, Len(.tag) -
RInStr(.tag, "/")))
- ' ' .Add(("Do not mount"))
- ' '
- ' ' '.ReadOnly = TRUE
- ' ' END WITH
- ' ' ME.oWMntPoints.Add(cb)
- ' '
- ' '
- ' '
- ' ' y = y + tl.Height + 4
- ' ' NEXT
- ' '
- ' '
- ' '
- ' '
- ' ' 'END IF
+ MdlCore.warn_status_off()
+
ELSE
' no widnows partitions found
|
