Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r386 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-10 17:03:50
|
Author: M0...@gm...
Date: Wed Dec 10 09:02:55 2008
New Revision: 386
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmInstallSys.class
branches/iVL/FrmSummary.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlInstallSys.module
branches/iVL/installer.gambas
Log:
debugging navigation
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Dec 10 09:02:55 2008
@@ -34,91 +34,91 @@
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:442
+#: FMain.class:441
msgid "You have not selected any operating systems for your boot menu."
msgstr ""
-#: FMain.class:442
+#: FMain.class:441
msgid "If you wish to bypass the bootloader setup, uncheck the"
msgstr ""
-#: FMain.class:442
+#: FMain.class:441
msgid "checkbox."
msgstr ""
-#: FMain.class:452
+#: FMain.class:451
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:453
+#: FMain.class:452
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:462
+#: FMain.class:461
msgid "Skipping boot loader setup"
msgstr ""
-#: FMain.class:488
+#: FMain.class:487
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:504
+#: FMain.class:503
msgid "Please enter the root password. For your security purposes, do not
leave this blank"
msgstr ""
-#: FMain.class:509
+#: FMain.class:508
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:523
+#: FMain.class:522
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:523
+#: FMain.class:522
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:523
+#: FMain.class:522
msgid "Yes"
msgstr ""
-#: FMain.class:523
+#: FMain.class:522
msgid "No"
msgstr ""
-#: FMain.class:541
+#: FMain.class:542
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:541
+#: FMain.class:542
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:541
+#: FMain.class:542
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:559
+#: FMain.class:560
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:564
+#: FMain.class:565
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:813
+#: FMain.class:819
msgid "Back"
msgstr ""
-#: FMain.class:824
+#: FMain.class:830
msgid "Exit Installation"
msgstr ""
-#: FMain.class:835
+#: FMain.class:841
msgid "Next"
msgstr ""
-#: FMain.class:849
+#: FMain.class:855
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Dec 10 09:02:55 2008
@@ -46,55 +46,55 @@
msgid "Mount Point"
msgstr ""
-#: FrmSummary.class:46
+#: FrmSummary.class:47
msgid "Format ?"
msgstr ""
-#: FrmSummary.class:52
+#: FrmSummary.class:53
msgid "Not Used"
msgstr ""
-#: FrmSummary.class:71
+#: FrmSummary.class:72
msgid "Do not format"
msgstr ""
-#: FrmSummary.class:72
+#: FrmSummary.class:73
msgid "No"
msgstr ""
-#: FrmSummary.class:74
+#: FrmSummary.class:75
msgid "Yes"
msgstr ""
-#: FrmSummary.class:100
+#: FrmSummary.class:101
msgid "None"
msgstr ""
-#: FrmSummary.class:123
+#: FrmSummary.class:124
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:177
+#: FrmSummary.class:178
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:186
+#: FrmSummary.class:187
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:213
+#: FrmSummary.class:214
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:289
+#: FrmSummary.class:290
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:299
+#: FrmSummary.class:300
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:309
+#: FrmSummary.class:310
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Dec 10 09:02:55 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.17
+Version=0.1.21
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Dec 10 09:02:55 2008
@@ -420,8 +420,7 @@
CASE "FrmSummary"
' frmNext = FrmHostPrep ' prepare host
frmNext = FrmInstallSys
-
- 'POST INSTALL CONFIGURATION
+
CASE "FrmInstallSys"
MdlInstallSys.WRITE_NEW_DISTRO_ID()
'moved binding to end of install in MdlInstallCustom.INSTALL_KERNELS
@@ -528,6 +527,8 @@
FrmUserAdd.btImportAcct.ForeColor = Color.Gray
frmNext = FrmUserAdd
END SELECT
+ ELSE
+ frmNext = FrmUserAdd
END IF
END IF
@@ -617,6 +618,11 @@
ELSE
frmNext.Show
WAIT 1
+ FrmCredits.Reparent(FrmInstallSys.embCredits)
+ FrmCredits.Show()
+ FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Inst1"].Selected = TRUE
MdlSetup.BEGIN_INSTALLATION()
END IF
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Wed Dec 10 09:02:55 2008
@@ -52,23 +52,13 @@
FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
FMain.tvPlan["Inst1"].Selected = TRUE
ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3>"
- ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
-' ME.tlCurrPkg2.Text
- ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
-' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
-' FMain.tvPlan["Inst1"].Selected = TRUE
- 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3= "<b>" &
tlCurrPkg2.Text & "</b>"
+
ME.tlCurrStepLbl.Text = ("Current Step")
-'ME.ResizeScaled(ME.Parent.Width, ME.Parent.Height)
-'ME.scrlCredits.Border = Border.Sunken
-WAIT 1
-'Message("Window has been resized")
-'ME.scrlCredits.Border = Border.Plain
-WAIT 2
-'ME.BEGIN_PROCESS() ' COMMENTED FOR TESTING PURPOSES
+
+
PRINT "Begin installation process"
' ' ' MdlSetup.BEGIN_INSTALLATION()
@@ -76,13 +66,7 @@
FrmCredits.Reparent(ME.embCredits)
FrmCredits.Show
- ' temporaryli allow this
- 'FMain.btnext.Enabled = TRUE
-
- ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
-' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
-' FMain.tvPlan["Inst1"].Selected = TRUE
- 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3
+
END
@@ -92,37 +76,6 @@
END
-' ' ' PUBLIC SUB Form_Resize()
-' ' '
-' ' ' DIM iMinFrameH AS Integer
-' ' ' iMinFrameH = ME.tlCurrPkg.Height + ME.tlCurrPkg2.Height +
ME.tlCurrStepLbl.Height + ME.pbInstallProg2.Height +
ME.tlCurrStepLbl.Height + 36
-' ' ' WITH ME
-' ' ' '.FrmProg.Move(4, .tlBanner.top + .tlBanner.Height +
8, .ClientWidth - (.FrmProg.Left * 2), iMinFrameH)
-' ' ' .tlBanner.Move(4, 16, .ClientWidth - (.tlBanner.Left * 2))
-' ' ' .hrsep.Move(4, .tlBanner.top + .tlBanner.Height
- .hrsep.Height, .tlBanner.Width)
-' ' ' '.tlBanner.Border = Border.Plain
-' ' ' '.FrmProg.Move(4, .tlBanner.top + (.tlBanner.Height +
36), .ClientWidth - (.FrmProg.Left * 2))
-' ' ' '.FrmProg.Move(4, .hrsep.top + .hrsep.Height
+ .tlBanner.Height, .ClientWidth - (.FrmProg.Left * 2))
-' ' ' ' / The following objects are inside the frame
-' ' ' .tlCurrPkg.move(8, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
-' ' ' .tlCurrStepLbl.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 4), MdlObjSizer.get_object_width(.tlCurrStepLbl.Text)
+ 8, 27)
-' ' ' .pbInstallProg.Move(.tlCurrStepLbl.left +
(.tlCurrStepLbl.Width), .tlCurrStepLbl.top, .FrmProg.Width -
(.tlCurrStepLbl.Width + (.tlcurrsteplbl.left * 2)))
-' ' ' .tlCurrPkg2.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height * 2.5), .FrmProg.Width - (.tlCurrPkg.Left * 2))
-' ' ' .pbInstallProg2.Move(.tlCurrPkg2.Left, .tlCurrPkg2.top +
(.tlCurrPkg2.Height + 2), .tlCurrPkg2.Width, 27)
-' ' ' .FrmProg.Move(4, hrsep.top + .hrsep.Height
+ .tlBanner.Height, .clientw - (.FrmProg.x * 2), 32 + (.tlCurrStepLbl.H
+ .tlCurrPkg.h + .tlCurrPkg2.h + (.pbInstallProg2.h * 2)))
-' ' ' ' .frmCredits.Move(.FrmProg.left, .FrmProg.top
+ .FrmProg.Height + 16, .FrmProg.Width)
-' ' ' '.scrlCredits.move(8, 24, .FrmProg.Width - (.scrlCredits.left
* 2))
-' ' ' '.scrlCredits.Move(.FrmProg.left, .FrmProg.top +
FrmProg.Height + 24, .FrmProg.Width)
-' ' '
-' ' ' '.tlCredits.Move(8, 4)
-' ' '
-' ' ' '.pbInstallProg.Move(.tlCurrStepLbl.Left +
(.tlCurrStepLbl.Width + 2), .FrmProg.Width - (.tlCurrStepLbl.Width +
(.tlCurrStepLbl.left * 2))) '
-' ' ' '.pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 2), .tlCurrPkg.Width)
-' ' '
-' ' ' END WITH
-
-
-''''''END
PUBLIC SUB HIDE_PROGRES_CONTROLS()
@@ -133,38 +86,4 @@
.pbInstallProg2.Visible = FALSE
END WITH
-END
-
-
-
-
-
-
-
-' PUBLIC SUB Form_Resize()
-'
-' WITH ME
-' .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.x * 2))
-' .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
-' '.FrmProg.Move(4, .hrsep.top + .hrsep.Height
+ .tlBanner.Height, .clientwidth - (.FrmProg.left * 2), (.tlBanner.Height *
4))
-' ' items inside the frame
-' .tlCurrPkg.Move(4, .hrsep.top + .hrsep.Height + 48, .hrsep.Width)
-'
-' '.tlCurrPkg.Move(4, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
-' .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 4,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
-' '.pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .FrmProg.w - (.pbInstallProg.x +
(.tlCurrStepLbl.left * 2)))
-' '.pbInstallProg.Move(.tlCurrStepLbl.left + .tlCurrStepLbl.Width +
4, tlCurrStepLbl.top + (tlCurrStepLbl.Height / 4), .ClientWidth -
(.pbInstallProg.Left - 4), .tlCurrStepLbl.Height / 2) '.hrsep.Width -
(pbInstallProg.Left))
-' .tlCurrPkg2.Move(4, .pbInstallProg.top + .pbInstallProg.Height +
24, MdlObjSizer.get_object_width(.tlCurrPkg2.text))
-' '.pbInstallProg2.Move(8, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .FrmProg.Width - (.pbInstallProg2.x * 2))
-' .pbInstallProg2.Move(4, tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .hrsep.Width)
-' .embCredits.Move(.ClientWidth / 2 - (.embCredits.Width /
2), .pbInstallProg2.top + .pbInstallProg2.Height + 8)
-' .embCredits.Height = .ClientH - .embCredits.top - 16
-' END WITH
-'
-' END
-
-PUBLIC SUB Form_Activate()
-
-
-
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Wed Dec 10 09:02:55 2008
@@ -37,12 +37,13 @@
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***")
+ ME.GridView1.Columns[0].Width =
MdlObjSizer.get_object_width("/dev/hda1***") + 36
ME.GridView1.Columns[1].text = ("Size")
ME.GridView1.Columns[1].Width =
MdlObjSizer.get_object_width(ME.GridView1.Columns[1].text) * 2
ME.GridView1.Columns[2].text = ("Filesystem")
- ME.GridView1.Columns[2].Width =
MdlObjSizer.get_object_width(("Filesystem")) * 1.25
+ ME.GridView1.Columns[2].Width =
MdlObjSizer.get_object_width(("Filesystem")) * 2
ME.GridView1.Columns[3].text = ("Mount Point")
+ ME.GridView1.Columns[3].Width =
MdlObjSizer.get_object_width(("Mount Point")) * 2
ME.GridView1.Columns[4].Text = ("Format ?")
'ME.GridView1.Columns[3].Width =
MdlObjSizer.get_object_width(ME.GridView1.Columns[3].text)
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Wed Dec 10 09:02:55 2008
@@ -343,15 +343,17 @@
"sleep 20"
'"echo done >/tmp/status" & gb.NewLine
-File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)
+EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "init"] WAIT
+EXEC ["chmod", "700", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "init"] WAIT
+EXEC ["touch", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup" &/ "init"
&/ "config-stage2"] WAIT
+
+File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-vinstall-ng",
sOut)
-EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "config-vinstall-ng"] WAIT
+EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "init" &/ "config-vinstall-ng"] WAIT
SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
-EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "init"] WAIT
-EXEC ["chmod", "700", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "init"] WAIT
-EXEC ["touch", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup" &/ "init"
&/ "config-stage2"] WAIT
+
sOut = "#!/bin/bash \n" &
". /sbin/vasm-functions \n" &
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Wed Dec 10 09:02:55 2008
@@ -18,9 +18,7 @@
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
- 'PUBLIC iPkgCnt AS Integer
- 'PUBLIC iPkgNum AS Integer = 0
-
+
PUBLIC FUNCTION MOUNT_DEFINED_PARTITIONS() AS Integer
@@ -61,17 +59,6 @@
SHELL "mount " & ClsPartSel.sTmp & Space(1) & ClsGlobal.sTargetMnt
&/ "tmp -t " & ClsPartSel.fTmp WAIT
END IF
- 'WRITE THE NEW FSTAB NOW, RIGHT BEFORE INSTALLING PACKAGES.
-
- 'ME.WRITE_NEW_FSTAB() ' do this from the install form
- 'redirect to packages install
- 'ME.INSTALL_PACKAGES()
- ' FROM HERE, DECIDE WHICH WAY TO GO
-
- 'ClsGlobal.sTargetMnt = "/home/moises/mnt/target" ' for testing only
-
-
- 'MdlSetup.RUN_CREDITS() ' Begin scrolling credits
IF ClsPkgSel.bCustom = TRUE THEN
MdlInstallCustom.PERFORM_CUSTOM_INSTALL()
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
