Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r218 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-10-08 21:28:20
|
Author: M0...@gm...
Date: Wed Oct 8 14:26:25 2008
New Revision: 218
Added:
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmInstallSysN.class
branches/iVL/FrmInstallSysN.form
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/FrmLicense.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/FMain.class
branches/iVL/FrmLilo.class
branches/iVL/FrmPartSel.form
branches/iVL/FrmRootPass.class
branches/iVL/FrmRootPass.form
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/MdlPartSel.module
branches/iVL/MdlSetup.module
branches/iVL/MdlUsrAdd.module
branches/iVL/installer.gambas
Log:
- Optimized the following windows for 800x600 resolution (failsafe)
+ Lilo Config window
+ Root Password setting
- Other acheivements
+ Managed to break the FrmInstallSys window
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/.project
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsGlobal.class
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsPartSel.class
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsWinDrives.class
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FMain.class
+# /home/moe/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -34,23 +34,23 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:408
+#: FMain.class:409
msgid "Process Overview"
msgstr ""
-#: FMain.class:428
+#: FMain.class:429
msgid "Next"
msgstr ""
-#: FMain.class:434
+#: FMain.class:435
msgid "Back"
msgstr ""
-#: FMain.class:440
+#: FMain.class:441
msgid "Exit Installation"
msgstr ""
-#: FMain.class:456
+#: FMain.class:457
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmDiskPart.class
+# /home/moe/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmLicense.class
+# /home/moe/projects/installer/FrmLicense.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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartScheme.class
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartSel.class
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPkgSel.class
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSelISO.class
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSummary.class
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmWinDrives.class
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlCore.module
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlDiskPart.module
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlObjSizer.module
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlPartSel.module
+# /home/moe/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -18,27 +18,27 @@
msgid "PARTITION"
msgstr ""
-#: MdlPartSel.module:77
+#: MdlPartSel.module:78
msgid "MOUNT POINT"
msgstr ""
-#: MdlPartSel.module:86
+#: MdlPartSel.module:88
msgid "FILESYSTEM"
msgstr ""
-#: MdlPartSel.module:148
-msgid "Not Used"
+#: MdlPartSel.module:137
+msgid "Do not format"
msgstr ""
-#: MdlPartSel.module:174
-msgid "Do not format"
+#: MdlPartSel.module:139
+msgid "Not Used"
msgstr ""
-#: MdlPartSel.module:293
+#: MdlPartSel.module:284
msgid "Please select only one "
msgstr ""
-#: MdlPartSel.module:293
+#: MdlPartSel.module:284
msgid "partition"
msgstr ""
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlPkgSel.module
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlSetup.module
+# /home/moe/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -13,4 +13,12 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+
+#: MdlSetup.module:261
+msgid "Activating swap space"
+msgstr ""
+
+#: MdlSetup.module:263
+msgid "Preparing filesystems"
+msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlSummarize.module
+# /home/moe/projects/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 Oct 8 14:26:25 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlWinDrives.module
+# /home/moe/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Oct 8 14:26:25 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.102
+Version=0.0.103
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Oct 8 14:26:25 2008
@@ -1 +1,5 @@
-- Fixed problem with user accounts not getting created.
\ No newline at end of file
+- Optimized the following windows for 800x600 resolution (failsafe)
+ + Lilo Config window
+ + Root Password setting
+- Other acheivements
+ + Managed to break the FrmInstallSys window
\ No newline at end of file
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Oct 8 14:26:25 2008
@@ -41,7 +41,7 @@
-'ME.Maximized = TRUE
+ME.Maximized = TRUE
frmInit = MdlCore.frmInit
'MdlCore.LOCK_GUI
'frmInit = FrmLangSel
@@ -75,8 +75,8 @@
.tvPlan.BackColor = Color.transparent
.tlBanner.Height = .PictureBox1.Height
'.tvPlan.Width = MdlCore.iLeftWidth
- .Width = 800
- .Height = 600
+ '.Width = 800
+ '.Height = 600
END WITH
@@ -335,6 +335,7 @@
'IF FrmCurr.text = "FrmLangSel" THEN STOP EVENT
frmNext.Reparent(ME.pnlWinHost)
+ frmNext.ResizeScaled(pnlwinhost.Width, pnlwinhost.Height)
FrmCurr.Hide
frmLast = FrmCurr
Added: branches/iVL/FrmInstallSys.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSys.class Wed Oct 8 14:26:25 2008
@@ -0,0 +1,196 @@
+' Gambas class 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 BEGIN_PROCESS()
+
+ DIM sRes AS Integer ' we will need to
+
+ MdlCore.lock_gui()
+ FMain.FrmCurr = ME
+FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+FMain.tvPlan["Inst1"].Selected = TRUE
+
+MdlInstallSys.ACTIVATE_SWAP_SPACE() ' activate swap for the current install
+
+MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' formats partitions and mounts them
+
+END
+
+
+
+
+
+PUBLIC SUB Form_Open()
+
+ ' ' ' 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))
+ ' ' ' .tlCurrPkg.move(8, 32, .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)
+ ' ' '
+ ' ' ' .scrlCredits.Move(.FrmProg.left, .FrmProg.top + FrmProg.Height
+ 24, .FrmProg.Width)
+ ' ' '
+ ' ' ' .tlCredits.Move(8, 4)
+ ' ' ' END WITH
+ ' ' '
+
+FMain.FrmCurr = ME
+
+FMain.FrmCurr = ME
+FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+FMain.tvPlan["Inst1"].Selected = TRUE
+ ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3>"
+
+
+'MdlSetup.RUN_CREDITS
+
+ 'ClsGlobal.sSourceMnt = "/mnt/cdrom"
+ 'ME.FrmProg.Text = " Preparing system for installation "
+ ME.tlCurrStepLbl.Text = ("Current Step")
+ 'ME.show_credits
+ 'MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
+ 'ME.tmCredits.Enabled = TRUE
+
+'STOP EVENT
+
+'MdlSetup.RUN_CREDITS(ClsGlobal.sSourceMnt &/ "CREDIT", ME.tlCredits)
+'WAIT
+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
+MdlSetup.BEGIN_INSTALLATION()
+
+
+
+END
+
+PUBLIC SUB Form_Show()
+
+ Form_Open()
+
+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()
+
+ WITH ME
+ .tlCurrStepLbl.Visible = FALSE
+ .pbInstallProg.Visible = FALSE
+ .tlCurrPkg2.Visible = FALSE
+ .pbInstallProg2.Visible = FALSE
+ END WITH
+
+END
+
+
+
+
+PUBLIC SUB tmCredits_Timer()
+
+ ' ' ' DIM i AS Integer = ME.FrmProg.left + 20
+ ' ' '
+ ' ' ' IF ME.tlCredits.x < (i) - (ME.tlCredits.Width) THEN ME.tlCredits.x
= (frmCredits.Width - 12)
+ ' ' ' tlCredits.x = frmCredits.left + 4 + (tlCredits.x - 10)
+ ' ' '
+ ' ' '
+
+
+
+
+ DIM X AS Integer
+ X = ME.scrlCredits.ScrollX
+ REPEAT
+ INC ME.scrlCredits.ScrollX
+ IF X = ME.scrlCredits.Scrollx THEN
+ ME.scrlCredits.scrollx = 0
+ ME.tmCredits.Enabled = FALSE
+ END IF
+ UNTIL tmCredits.Enabled = FALSE
+
+
+ '
+ ' IF ME.sclCredits.ScrollX < - ME.tlCredits.Width + ME.tlCredits.x THEN
+ ' ME.sclCredits.Scrollx = ME.sclCredits.Width
+ ' ENDIF
+
+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, .clientw - (.FrmProg.x * 2), .clienth - (.FrmProg.y
+ .tlBanner.h))
+ ' items inside the frame
+ .tlCurrPkg.Move(8, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
+ .tlCurrStepLbl.Move(8, .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)))
+ .tlCurrPkg2.Move(8, .pbInstallProg.top + .pbInstallProg.Height +
4, .ClientW - (.tlCurrPkg2.x * 2))
+ .pbInstallProg2.Move(8, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .FrmProg.Width - (.pbInstallProg2.x * 2))
+ END WITH
+
+END
Added: branches/iVL/FrmInstallSys.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSys.form Wed Oct 8 14:26:25 2008
@@ -0,0 +1,51 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,96,74)
+ Text = ("")
+ Maximized = True
+ { tlBanner TextLabel
+ MoveScaled(1,1,63,7)
+ Text = ("Vectorlinux is currently being installed to your system...
Please wait")
+ }
+ { hrsep Separator
+ MoveScaled(2,8,48,2)
+ }
+ { FrmProg Frame
+ MoveScaled(1,11,76,34)
+ Text = ("")
+ { pbInstallProg2 ProgressBar
+ MoveScaled(0,18,44,3)
+ }
+ { tlCurrPkg2 TextLabel
+ MoveScaled(1,14,45,3)
+ Text = ("Total progress")
+ }
+ { pbInstallProg ProgressBar
+ MoveScaled(13,10,31,2)
+ Label = False
+ }
+ { tlCurrStepLbl TextLabel
+ MoveScaled(1,9,11,3)
+ Text = ("Current Step ")
+ }
+ { tlCurrPkg TextLabel
+ MoveScaled(1,0,73,6)
+ Text = ("Installing ...")
+ }
+ }
+ { tmCredits #Timer
+ #X = 560
+ #Y = 77
+ Delay = 50
+ }
+ { scrlCredits ScrollView
+ MoveScaled(2,56,84,5)
+ Border = False
+ ScrollBar = Scroll.None
+ { tlCredits TextLabel
+ MoveScaled(-2,0,46,3.375)
+ Text = ("")
+ }
+ }
+}
Added: branches/iVL/FrmInstallSysN.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSysN.class Wed Oct 8 14:26:25 2008
@@ -0,0 +1,31 @@
+' Gambas class file
+
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2))
+ .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
+ .frmProg.Move(4, .hrsep.top + .hrsep.Height + (.tlBanner.Height *
2), .ClientWidth - (.frmProg.left * 2), .ClientHeight - (.frmProg.top *
2)) '- .tlBanner.Height))
+ .tlCurrPkg.Move(4, 24, .frmProg.Width - (.tlCurrPkg.left * 2))
+ .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 8,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
+ .pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .frmProg.Width - (.pbInstallProg.Left +
(.tlCurrStepLbl.left * 2)))
+ .tlCurrPkg2.Move(4, .tlCurrStepLbl.Top + (.tlCurrStepLbl.Height * 2),
MdlObjSizer.get_object_width(.tlCurrPkg2.text))
+ .pbInstallProg2.Move(.tlCurrPkg2.left + .tlCurrPkg2.Width +
8, .tlCurrPkg2.top, .frmProg.Width - (.pbInstallProg2.left +
(.tlCurrPkg2.left * 2)))
+ '.pbInstallProg2.Move(4, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .frmProg.Width - (.pbInstallProg2.left * 2))
+
+ END WITH
+
+END
+
+PUBLIC SUB Form_Open()
+
+ FMain.FrmCurr = ME
+FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+FMain.tvPlan["Inst1"].Selected = TRUE
+
+'ready to start installing
+Message.Info("Ready to start installing")
+MdlSetup.BEGIN_INSTALLATION() ' begin the installation process
+END
Added: branches/iVL/FrmInstallSysN.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSysN.form Wed Oct 8 14:26:25 2008
@@ -0,0 +1,36 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,64)
+ Text = ("")
+ { tlBanner TextLabel
+ MoveScaled(1,1,19,4)
+ Text = ("")
+ }
+ { hrsep Separator
+ MoveScaled(10,6,10,1)
+ }
+ { frmProg Frame
+ MoveScaled(1,9,60,27)
+ Text = ("")
+ { tlCurrPkg TextLabel
+ MoveScaled(2,1,16,3)
+ Text = ("")
+ }
+ { tlCurrStepLbl TextLabel
+ MoveScaled(2,6,15,2.25)
+ Text = ("Current Step")
+ }
+ { pbInstallProg ProgressBar
+ MoveScaled(14,7,9,2)
+ Label = False
+ }
+ { tlCurrPkg2 TextLabel
+ MoveScaled(2,11,11,3)
+ Text = ("Total Progress")
+ }
+ { pbInstallProg2 ProgressBar
+ MoveScaled(14,11,9,3)
+ }
+ }
+}
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Wed Oct 8 14:26:25 2008
@@ -94,8 +94,8 @@
.tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height *
1.5), MdlObjSizer.get_object_width(.tlTarGet.Text))
.LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 4, .tlTarGet.top,
(.tlBanner.Width / 2.75) - (.tlTarGet.Width + .tlTarGet.left))
.tlFbMode.Move(.LiloTarget.Left + LiloTarget.Width +
32, .LiloTarget.top, MdlObjSizer.get_object_width(.tlFbMode.text))
-
- .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
4, .tlFbMode.top, .ClientWidth - (.FBResolution.Left + (.FBResolution.Width
* 0.75)))
+ .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
8, .tlFbMode.top, .ClientWidth - (.FBResolution.Left + 16))
+ '.FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
4, .tlFbMode.top, .ClientWidth - (.FBResolution.Left + (.FBResolution.Width
* 0.75)))
cbleft = .FBResolution.Left
cbwidth = .FBResolution.Width
.tlTimeOUt.Move(.tlTarGet.left, .tlTarGet.top + .tlTarGet.Height + 12,
MdlObjSizer.get_object_width(.tlTimeOUt.Text))
Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form (original)
+++ branches/iVL/FrmPartSel.form Wed Oct 8 14:26:25 2008
@@ -4,14 +4,14 @@
MoveScaled(0,0,72,55)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(1,1,61,3.7143)
+ MoveScaled(1,1,59,5)
Text = ("Please select the partitions you wish to use and how to use
them")
}
{ scrollPartitions ScrollView
MoveScaled(1,9,69,38)
}
{ cbDoWin CheckBox
- MoveScaled(1,50,57,3.1429)
+ MoveScaled(1,50,57,3.125)
ToolTip = ("Check this box if you have a Windows installation on your
system or any other windows partition (FAT, FAT32, NTFS) that you want
auto-mounted as soon as your computer starts")
Text = ("Detect and Setup Windows partitions for auto-mounting at
boot")
}
@@ -21,6 +21,6 @@
Picture = Picture["icon:/small/help"]
}
{ hrSep Separator
- MoveScaled(3,6,19,1)
+ MoveScaled(3,7,19,1)
}
}
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Wed Oct 8 14:26:25 2008
@@ -31,7 +31,7 @@
PUBLIC SUB Button1_Click()
IF ME.tbPasswd1.Text = "" THEN
- Message("Enter a Password for root.")
+ 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)
@@ -55,7 +55,8 @@
WITH ME
.tlbanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2))
.hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
- .Frame1.Resize(.ClientWidth - (.Frame1.Left * 2), .tlBanner.Height * 4)
+ '.Frame1.Resize(.ClientWidth - (.Frame1.Left * 2), .tlBanner.Height *
4)
+ .Frame1.Move(4, hrSep.top + .hrSep.Height + .tlBanner.Height, .ClientW
- (.Frame1.left * 2), tlbanner.height * 4)
.tlAboutRoot.Move(4, 24, .Frame1.Width - (.tlAboutRoot.Left *
2), .Frame1.Height - .tlAboutRoot.top - 8)
.tlPass1.Move(.Frame1.left, .Frame1.top + .Frame1.Height + 24,
MdlObjSizer.get_object_width(.tlPass1.text), 21)
.tlPass2.Move(.tlPass1.Left, .tlPass1.top + .tlPass1.Height + 4,
MdlObjSizer.get_object_width(.tlPass2.text), 21)
Modified: branches/iVL/FrmRootPass.form
==============================================================================
--- branches/iVL/FrmRootPass.form (original)
+++ branches/iVL/FrmRootPass.form Wed Oct 8 14:26:25 2008
@@ -12,7 +12,7 @@
}
}
{ tlBanner TextLabel
- MoveScaled(2,1,62,3.1667)
+ MoveScaled(2,2,62,3.125)
Text = ("System Administrator")
}
{ hrSep Separator
@@ -23,21 +23,21 @@
Text = ("Set Password")
}
{ tbPasswd2 TextBox
- MoveScaled(29,6,21,3.1667)
+ MoveScaled(32,36,21,3.125)
Text = ("")
Password = True
}
{ tbPasswd1 TextBox
- MoveScaled(30,0,21,3.1667)
+ MoveScaled(32,31,21,3.125)
Text = ("")
Password = True
}
{ tlPass1 TextLabel
- MoveScaled(0,1,22,4)
+ MoveScaled(2,32,22,4)
Text = ("Enter Password")
}
{ tlPass2 TextLabel
- MoveScaled(0,6,22,4)
+ MoveScaled(3,36,22,4)
Text = ("Re-Enter Password")
}
}
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Oct 8 14:26:25 2008
@@ -152,7 +152,7 @@
.tbRealname.Move(iboxleft, .tlRealName.top, iboxwidth)
.TextLabel3.Move(4, .tlRealName.top + .tlRealName.Height +
2, .TextLabel2.Width)
.tbPasswd1.Move(iboxleft, .TextLabel3.top, iboxwidth)
- .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height +
2, .TextLabel2.Width)
+ .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height + 2,
MdlObjSizer.get_object_width(.TextLabel4.text))
.tbPasswd2.Move(iboxleft, .TextLabel4.top, iboxwidth)
'.tlUserID.Move(4, .TextLabel4.top + .TextLabel4.Height +
2, .TextLabel2.Width)
'.cbUserID.Move(iboxleft, .tlUserID.top, iboxwidth * 0.45)
@@ -163,7 +163,7 @@
.tbPicPath.Move(4, .bUsePic.top + .bUsePic.Height +
2, .TextLabel2.Width + iboxwidth + 8)
'.tbPicPath.Move(4, .bUsePic.top + .bUsePic.height +
2, .tlBanner.Width - (.btBrowse.Width + 4))
.btBrowse.Move(.tbPicPath.Left + .tbPicPath.Width + 4, .tbPicPath.top,
MdlObjSizer.get_object_width(.btBrowse.text) + 36)
- .fGroupSel.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientW -
(.fGroupSel.Left * 2), .ClientH - (.fGroupSel.top + .Button1.Height
+ .Button1.height))
+ .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)
'.pbUsrPic.Move(.tbUsername.Left + (.tbUsername.Width +
2), .tbUsername.top)
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Wed Oct 8 14:26:25 2008
@@ -4,7 +4,7 @@
MoveScaled(0,0,76,67)
Text = ("")
{ tlExp TextLabel
- MoveScaled(1,9,55,8)
+ MoveScaled(1,9,55,6)
Text = ("Choose a unique name for each user. Enter the password for
twice for accuracy. You can make as many users as you want, and when you
are finished click next to continue.")
}
{ tbUsername TextBox
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Wed Oct 8 14:26:25 2008
@@ -68,26 +68,28 @@
.Height = 27
.x = x
.y = y
- .Width = MdlObjSizer.get_object_width(.text) * 2.2
+ .Width = MdlObjSizer.get_object_width("/dev/hda1 (100 GB)")
+ '.Width = MdlObjSizer.get_object_width(.text) '* 1.5
END WITH
icol1 = x
- icol2 = x + tl.Width + 4
+ icol2 = x + (tl.Width * 1.25)
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
WITH tl
.text = "<b>" & ("MOUNT POINT") & "</b>"
.Height = 27
.x = icol2
.y = y
- .Width = MdlObjSizer.get_object_width(.text) * 2.2
+ .Width = MdlObjSizer.get_object_width(.text) '* 1.5
END WITH
- icol3 = tl.x + tl.Width + 4
+ icol3 = tl.left + (tl.Width * 1.5)
+ 'iboxwidth = tl.Width
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
WITH tl
.text = "<b>" & ("FILESYSTEM") & "</b>"
.Height = 27
.x = icol3
.y = y
- .Width = MdlObjSizer.get_object_width(.text) * 2.2
+ .Width = MdlObjSizer.get_object_width(.text) '* 1.5
END WITH
y = y + 20
@@ -104,18 +106,7 @@
sPart = Right(sPartList[i], Len(sPartList[i]) -
RInStr(sPartList[i], "/"))
- 'Message.Info(sPart)
- ' ' ' 'make sure the mount point exists
- ' ' ' IF IsDir("/mnt" &/ sPart) = FALSE THEN
- ' ' ' SHELL "mkdir /mnt" &/ sPart WAIT
- ' ' ' END IF
- ' ' ' ' Now mount the partition
- ' ' ' SHELL "mount " & Trim(sPartList[i]) & Space(1)
& "/mnt" &/ sPart WAIT
- ' ' ' ' get the size using df -h | grep sPart and some
sed
- ' ' ' ' will embed some bash, but should probabbly be
fixed
- ' ' ' SHELL "export " & sPart & "=$(df -h | grep " & sPart
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
- ' ' ' 'Message(sPart & Space(1) & "[ " & Trim(sSize) & "
]")
SHELL "export size=$(parted " & sDrive & " print | grep ^\'"
& sBlank & sPartNo & "\'); echo $size | cut -f 4 -d \' \'" TO sSize
'create the label and the drop down box here
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "Labels"
@@ -143,7 +134,7 @@
.X = icol2 'FrmPartSel.tlPartRow2.Left
.y = y
.Height = tl.Height
- .Width = tl.Width
+ .Width = MdlObjSizer.get_object_width(("Do not format")) *
1.5 'tl.Width"
.ReadOnly = TRUE
.Add(("Not Used"))
.Add("/")
@@ -238,7 +229,7 @@
WITH cb
.y = y
.x = icol2
- .width = tl.Width
+ .width = MdlObjSizer.get_object_width(("Do not
format")) * 1.5 'tl.Width
.ReadOnly = TRUE
.Add("Swap")
.Add(("Not Used"))
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Wed Oct 8 14:26:25 2008
@@ -240,4 +240,29 @@
END
+PUBLIC SUB BEGIN_INSTALLATION()
+
+
+ WITH FrmInstallSys
+ .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2))
+ .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
+ .frmProg.Move(4, .hrsep.top + .hrsep.Height + (.tlBanner.Height *
2), .ClientWidth - (.frmProg.left * 2), .ClientHeight - (.frmProg.top *
2)) '- .tlBanner.Height))
+ .tlCurrPkg.Move(4, 24, .frmProg.Width - (.tlCurrPkg.left * 2))
+ .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 8,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
+ .pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .frmProg.Width - (.pbInstallProg.Left +
(.tlCurrStepLbl.left * 2)))
+ .tlCurrPkg2.Move(4, .tlCurrStepLbl.Top + (.tlCurrStepLbl.Height * 2),
MdlObjSizer.get_object_width(.tlCurrPkg2.text))
+ .pbInstallProg2.Move(.tlCurrPkg2.left + .tlCurrPkg2.Width +
8, .tlCurrPkg2.top, .frmProg.Width - (.pbInstallProg2.left +
(.tlCurrPkg2.left * 2)))
+ '.pbInstallProg2.Move(4, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .frmProg.Width - (.pbInstallProg2.left * 2))
+
+ END WITH
+
+
+ MdlCore.LOCK_GUI()
+ FrmInstallSys.tlCurrPkg.text = ("Activating swap space")
+ MdlInstallSys.ACTIVATE_SWAP_SPACE()
+ FrmInstallSys.tlCurrPkg.text = ("Preparing filesystems")
+ MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' This will start the install
process
+
+
+END
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Wed Oct 8 14:26:25 2008
@@ -28,6 +28,12 @@
objGrps = NEW Object[]
sGrpArr = Split(sGrpList, ",")
+'try to resize the window because the frame is too narrow
+ WITH FrmUserAdd
+ .Resize(.Parent.Width, .Parent.Height)
+ END WITH
+
+
y = 24
x = 4
FOR i = 0 TO sGrpArr.Count - 1
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
