Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r235 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-10-17 13:55:55
|
Author: M0...@gm...
Date: Fri Oct 17 06:54:46 2008
New Revision: 235
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/FMain.class
branches/iVL/FrmNetConf.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlNetConf.module
Log:
Debugging lilo setup window
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Oct 17 06:54:46 2008
@@ -14,59 +14,63 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:226
+#: FMain.class:205
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:228
+#: FMain.class:207
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:228
+#: FMain.class:207
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:242
+#: FMain.class:221
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:298
+#: FMain.class:277
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:327
+#: FMain.class:307
msgid "has been installed on your computer."
msgstr ""
-#: FMain.class:327
+#: FMain.class:307
+msgid "Additional system configuration will take place after you reboot
your system.Part of this process must be done in text mode."
+msgstr ""
+
+#: FMain.class:307
msgid "Would you like to reboot your computer now?"
msgstr ""
-#: FMain.class:327
+#: FMain.class:307
msgid "Yes"
msgstr ""
-#: FMain.class:327
+#: FMain.class:307
msgid "No"
msgstr ""
-#: FMain.class:421
+#: FMain.class:401
msgid "Process Overview"
msgstr ""
-#: FMain.class:441
+#: FMain.class:421
msgid "Next"
msgstr ""
-#: FMain.class:447
+#: FMain.class:427
msgid "Back"
msgstr ""
-#: FMain.class:453
+#: FMain.class:433
msgid "Exit Installation"
msgstr ""
-#: FMain.class:469
+#: FMain.class:449
msgid "Button1"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Fri Oct 17 06:54:46 2008
@@ -182,28 +182,7 @@
SELECT CASE FrmCurr.Name ' very nice navigation algoritm
- ' CASE "FrmLangSel"
- ' sLang = MdlLangSel.ID_LANG(Trim(FrmLangSel.lbLangSel.text))
- ' System.Language = sLang
- ' FMain.Close
- ' 'System.Language = sLang
- ' ''MdlCore.frmInit = FrmSelISO
- ' 'WAIT
- ' MdlCore.main
-
-
-
- ' now need to restart the application to make sure it takes effect
-
- 'SHELL Application.Args[0] & Space(1) & sLang
- 'QUIT
-
-
- ' SHELL "LC_ALL=" & sLang & Space(1) & "LANG=" & sLang & " ./" &
Application.Args[0] & Space(1) & sLang ' this will set the LANG environment
to what the user selects and restart the application.
- 'SHELL "LC_ALL=" & Application.Args[1] & Space(1) & "LANG=" &
Application.Args[1] & Space(1) & "./" & Application.Args[0] & Space(1) &
Trim(FrmLangSel.listbox1.text)
-' IF ERROR THEN Message(Error.Text & gb.NewLine & Error.where)
- 'QUIT
-
+
CASE "FrmSelISO"
sDev = Right(FrmSelISO.lstInstallableImg.Text,
Len(FrmSelISO.lstInstallableImg.Text) -
InStr(FrmSelISO.lstInstallableImg.text, "/") + 1)
@@ -324,7 +303,8 @@
'offer to reboot here
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"))
+ ("Additional system configuration will take place after you
reboot your system.Part of this process must be done in text mode.")
& "<br>" &
+ ("Would you like to reboot your computer now?"), ("Yes"),
("No"))
CASE 1
SHELL "shutdown -r now"
CASE ELSE
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Fri Oct 17 06:54:46 2008
@@ -42,7 +42,9 @@
END WITH
ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()
+
MdlNetConf.LIST_NETWORK_INTERFACES()
+ 'CATCH
cbUseManDNS.Value = FALSE
tlBanner.text = "<h3>" & tlBanner.text & "</h3>"
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Fri Oct 17 06:54:46 2008
@@ -110,6 +110,8 @@
DIM i AS Integer
DIM sTarget AS String
DIM sDump AS String
+ DIM cb AS ComboBox
+ DIM cb1 AS ComboBox
SHELL "probedisk | grep -v cdrom |cut -f 1 -d \'|\'" TO sList
sList = Trim(sList)
@@ -120,9 +122,22 @@
NEXT
WITH FrmLilo.LiloTarget
- IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
- .Add("Sector")
- END IF
+ 'IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
+ FOR EACH cb IN MdlPartSel.oMountPoints
+ IF cb.text = "/" THEN
+ FOR EACH cb1 IN MdlPartSel.oFsTypes
+ IF cb1.tag = cb.tag THEN
+ IF cb1.text <> "xfs" THEN .Add("Sector")
+ END IF
+ NEXT
+ END IF
+ NEXT
+
+ '.Add("Sector")
+' END IF
+
+
+
SHELL "lsdev | grep floppy" TO sDump
IF sDump <> "" THEN
.Add("Floppy")
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Fri Oct 17 06:54:46 2008
@@ -299,17 +299,7 @@
END IF
-
- ' ' ELSE
- ' tl = NEW TextLabel(FrmNetConf.TSNetDevices)
AS "tlWirelessSecType"
- ' WITH tl
- ' .Move(4, y)
- ' .text = "Security Mode"
- ' .Width = MdlObjSizer.get_object_width(.text)
- ' .Height = 21
- ' .Alignment = Align.Normal
- ' END WITH
- ' END IF
+
END WITH
@@ -468,19 +458,6 @@
END IF
-END
-
-PUBLIC SUB bEnableInterface_click()
-
- ' ' DIM fFrm AS Frame
- ' ' DIM Comb AS ComboBox
- ' ' FOR EACH fFrm IN objFrames
- ' ' IF fFrm.tag = LAST.tag THEN fFrm.Enabled = LAST.Value
- ' ' NEXT
- ' ' FOR EACH Comb IN objCombos
- ' ' IF Comb.tag = LAST.tag THEN Comb.Enabled = LAST.Value
- ' ' NEXT
- '''''' ******* Instead of that ^, this will only determing if the inet
script will be set executable or not
END
|
