Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r365 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-04 18:31:43
|
Author: M0...@gm...
Date: Thu Dec 4 10:30:29 2008
New Revision: 365
Modified:
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/FrmDiskPart.class
branches/iVL/FrmDone.class
branches/iVL/FrmUserAdd.class
branches/iVL/FrmZoneSet.class
branches/iVL/MdlSetup.module
branches/iVL/MdlZoneSet.module
Log:
Minor bugfixes... ready for testing
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Dec 4 10:30:29 2008
@@ -18,7 +18,7 @@
msgid "When finished making changes, exit the partitioning application to
continue ..."
msgstr ""
-#: FrmDiskPart.class:117
+#: FrmDiskPart.class:119
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Dec 4 10:30:29 2008
@@ -38,3 +38,35 @@
msgid "Preparing filesystems"
msgstr ""
+#: MdlSetup.module:345
+msgid "is performing final system configuration. Please wait a moment."
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "has been installed to your system. Your new system has been
configured with the default factory settings."
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "Your computer needs to be restarted so that you can use your new
operating system. Click"
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "to restart your computer now or click"
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "to restart your computer at a later time"
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "If you installed from CD-ROM/R/RW media, please remove de disk
before restarting."
+msgstr ""
+
+#: MdlSetup.module:356
+msgid "Restart"
+msgstr ""
+
Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class (original)
+++ branches/iVL/FrmDiskPart.class Thu Dec 4 10:30:29 2008
@@ -64,6 +64,7 @@
DIM bReboot AS Boolean
+ MdlCore.WARN_STATUS("")
FrmDiskPart.tlBanner.Text = "<h3><br>Analyzing system partitioning
scheme... Please wait<br>This will take a few seconds...</h3>"
FrmDiskPart.tlBanner.Refresh
FrmDiskPart.tlBanner.Adjust
@@ -95,4 +96,5 @@
FMain.btQuit.Enabled = TRUE
FMain.btQuit.ForeColor = Color.Black
END IF
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Thu Dec 4 10:30:29 2008
@@ -25,31 +25,10 @@
Fmain.tvPlan["Conf5"].Selected = TRUE
tlbanner.text = "<b>" & tlbanner.text & "</b>"
- FMain.btnext.Text = ("Restart")
- FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text) + 36
+
FMain.btback.Enabled = FALSE
FMain.btback.ForeColor = Color.Gray
- FMain.btQuit.Text = ("Exit")
- FMain.btQuit.Width = MdlObjSizer.get_object_width(FMain.btQuit.Text) + 36
- WITH ME.tlMsg
- .Text = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
- ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
- ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
- ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
- ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
- END WITH
- FMain.btnext.Enabled = TRUE
-
-END
-
-PUBLIC SUB tlMsg_MouseDown()
-
-
-
-END
-
-PUBLIC SUB PnlMsg_MouseDown()
-
+ MdlSetup.END_INSTALLER()
END
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Thu Dec 4 10:30:29 2008
@@ -46,6 +46,8 @@
PUBLIC SUB Form_Open()
+ DIM cb AS CheckBox
+
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
@@ -76,7 +78,12 @@
.Add(ME.tbUsername)
END WITH
-
+ IF MdlUsrAdd.objGrps THEN
+ FOR EACH cb IN MdlUsrAdd.objGrps
+ cb.Delete
+ NEXT
+ END IF
+
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.fGroupSel)
FMain.btnext.Enabled = TRUE
ME.tbUsername.SetFocus
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Thu Dec 4 10:30:29 2008
@@ -40,14 +40,7 @@
END
-' ' ' PUBLIC SUB Button1_Click()
-' ' ' ' THis is not necessary, since the next button on the main window
handles this
-' ' '
-' ' ' MdlZoneSet.SET_ZONE(ME.lbTmZone.Text)
-' ' ' MdlZoneSet.WRITE_CONF()
-' ' ' 'Message("TimeZone " & ME.lbTmZone.Text & " Was set.")
-' ' '
-' ' ' END
+
PUBLIC SUB Form_Resize()
@@ -96,38 +89,7 @@
RETURN
END IF
LOOP
-' ' ' ' '
-' ' ' ' '
-' ' ' ' '
-' ' ' ' ' 'Message(lbTmZone[2].text)
-' ' ' ' '
-' ' ' ' ' lbTmZone.Index = 0
-' ' ' ' ' REPEAT
-' ' ' ' ' 'INC lbTmZone.Index
-' ' ' ' '
-' ' ' ' ' IF lbTmZone[lbTmZone.Index].text LIKE Key.Text & "*" THEN
-' ' ' ' '
-' ' ' ' ' 'Message.Info(lbTmZone.text)
-' ' ' ' ' BREAK
-' ' ' ' ' END IF
-' ' ' ' ' INC lbTmZone.Index
-' ' ' ' ' IF lbTmZone.Index = lbTmZone.Count THEN RETURN ' nothing
found
-' ' ' ' ' UNTIL lbTmZone.Index = lbTmZone.Count
-' ' ' ' '
-
- ' DIM iScan AS Integer
- ' IF Key.text > "z" OR Key.text < " " THEN RETURN ' not scannable
- '
- ' iScan = lbTmZone.Index
- ' DO
- ' INC iScan
- ' IF iScan >= lbTmZone.Count THEN iScan = 0 ' back to top
- ' IF iScan = lbTmZone.Index THEN RETURN ' went back to were we
started
- ' IF lbTmZone[iScan].text LIKE Key.text & "*[*]*" THEN ' found
a match
- ' lbTmZone.Index = iScan
- ' END IF
- ' RETURN
- ' LOOP
+
END
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Dec 4 10:30:29 2008
@@ -336,4 +336,34 @@
END
+PUBLIC SUB END_INSTALLER()
+DIM sText AS String
+ ' Check for /tmp/status in the target installation
+ IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = FALSE THEN
+ REPEAT
+ WAIT
+ sText = ClsGlobal.DISTRO & Space(1) & ("is performing final system
configuration. Please wait a moment.")
+ FrmDone.tlMsg.Text = sText
+ 'FrmDone.tlMsg.Adjust
+ UNTIL Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = TRUE
+ sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
+ ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
+ ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
+ ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
+ ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
+ FrmDone.tlMsg.Text = sText
+ FMain.btnext.Enabled = TRUE
+ FMain.btnext.Text = ("Restart")
+ FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text) +
36
+
+ 'FrmDone.tlBanner
+
+ ENDIF
+
+
+
+
+END
+
+
Modified: branches/iVL/MdlZoneSet.module
==============================================================================
--- branches/iVL/MdlZoneSet.module (original)
+++ branches/iVL/MdlZoneSet.module Thu Dec 4 10:30:29 2008
@@ -37,7 +37,7 @@
stz = Split(sTimeZones, ",")
FOR EACH stz
- FrmZoneSet.lbTmZone.add(stz[i])
+ FrmZoneSet.lbTmZone.add(Trim(stz[i]))
INC i
NEXT
|
