Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r220 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-10-09 23:08:41
|
Author: m0e.lnx
Date: Thu Oct 9 14:31:16 2008
New Revision: 220
Removed:
branches/iVL/adduser.gambas
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/DevLog
branches/iVL/FMain.class
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmZoneSet.class
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlSetup.module
Log:
- Implemented keyboard shortcuts for zoneset list
- Some fixes to the Install window (stalls for a second before the process
begins, objects are out of place
as the form loads, but then snap into place when the install begins
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/.project
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsGlobal.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsPartSel.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsWinDrives.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FMain.class
+# /home/remote/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -34,23 +34,23 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:409
+#: FMain.class:416
msgid "Process Overview"
msgstr ""
-#: FMain.class:429
+#: FMain.class:436
msgid "Next"
msgstr ""
-#: FMain.class:435
+#: FMain.class:442
msgid "Back"
msgstr ""
-#: FMain.class:441
+#: FMain.class:448
msgid "Exit Installation"
msgstr ""
-#: FMain.class:457
+#: FMain.class:464
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmDiskPart.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmLicense.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartScheme.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmPartSel.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPkgSel.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSelISO.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSummary.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmWinDrives.class
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlCore.module
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlDiskPart.module
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlObjSizer.module
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlPartSel.module
+# /home/remote/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPkgSel.module
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlSetup.module
+# /home/remote/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,11 +14,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:261
+#: MdlSetup.module:247
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:263
+#: MdlSetup.module:249
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/MdlSummarize.module
+# /home/remote/area-51/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 Thu Oct 9 14:31:16 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlWinDrives.module
+# /home/remote/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Thu Oct 9 14:31:16 2008
@@ -1,5 +1,4 @@
-- 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
+- Implemented keyboard shortcuts for zoneset list
+- Some fixes to the Install window (stalls for a second before the process
begins, objects are out of place
+ as the form loads, but then snap into place when the install begins
+
\ No newline at end of file
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Oct 9 14:31:16 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
@@ -348,7 +348,14 @@
' IF ClsGlobal.sBackNav.Find(FrmCurr) = -1 THEN
ClsGlobal.sBackNav.Add(FrmCurr)
END IF
END IF
- frmNext.Show
+ IF frmNext.name <> "FrmInstallSys" THEN
+ frmNext.Show
+ ELSE
+ frmNext.Show
+ WAIT 1
+ MdlSetup.BEGIN_INSTALLATION()
+ END IF
+
END
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Thu Oct 9 14:31:16 2008
@@ -38,57 +38,27 @@
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
+' 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
+'ME.ResizeScaled(ME.Parent.Width, ME.Parent.Height)
+'ME.scrlCredits.Border = Border.Sunken
WAIT 1
-Message("Window has been resized")
+'Message("Window has been resized")
'ME.scrlCredits.Border = Border.Plain
WAIT 2
'ME.BEGIN_PROCESS() ' COMMENTED FOR TESTING PURPOSES
-MdlSetup.BEGIN_INSTALLATION()
+PRINT "Begin installation process"
+' ' ' MdlSetup.BEGIN_INSTALLATION()
@@ -146,36 +116,6 @@
-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
-
@@ -184,13 +124,23 @@
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))
+ '.FrmProg.Move(4, .hrsep.top + .hrsep.Height
+ .tlBanner.Height, .clientwidth - (.FrmProg.left * 2), (.tlBanner.Height *
4))
' 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))
+ .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, .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)
END WITH
+
+END
+
+PUBLIC SUB Form_Activate()
+
+
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Thu Oct 9 14:31:16 2008
@@ -3,7 +3,6 @@
{ 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")
@@ -11,41 +10,23 @@
{ 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 = ("")
- }
+ { pbInstallProg2 ProgressBar
+ MoveScaled(2,35,44,3)
+ }
+ { tlCurrPkg2 TextLabel
+ MoveScaled(3,31,45,3)
+ Text = ("Total progress")
+ }
+ { pbInstallProg ProgressBar
+ MoveScaled(15,27,31,2)
+ Label = False
+ }
+ { tlCurrPkg TextLabel
+ MoveScaled(3,17,73,6)
+ Text = ("Installing ...")
+ }
+ { tlCurrStepLbl TextLabel
+ MoveScaled(3,26,11,3)
+ Text = ("Current Step ")
}
}
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Thu Oct 9 14:31:16 2008
@@ -74,3 +74,58 @@
END
+
+PUBLIC SUB lbTmZone_KeyPress()
+
+
+
+ DIM i AS Integer
+
+ 'i = 0
+ IF Key.text > "z" OR Key.text < " " THEN RETURN ' not searchable
+
+ i = lbTmZone.Index
+ DO
+ INC i
+ IF i >= lbTmZone.Count THEN i = 0 'back to top
+ IF i = lbTmZone.Index THEN RETURN ' no other match found
+ IF lbTmZone[i].text LIKE Key.Text & "*" THEN
+ lbTmZone.Index = i
+ 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/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Oct 9 14:31:16 2008
@@ -28,6 +28,7 @@
PUBLIC SUB PERFORM_CUSTOM_INSTALL()
DIM iRet AS Integer = 0
+
WITH FMain
.tvPlan["Inst1"].Selected = TRUE
.tvPlan["Inst1"].Picture = MdlCore.sNowPic
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Oct 9 14:31:16 2008
@@ -72,7 +72,7 @@
'MdlSetup.RUN_CREDITS() ' Begin scrolling credits
IF ClsPkgSel.bCustom = TRUE THEN
- MdlInstallCustom.PERFORM_CUSTOM_INSTALL
+ MdlInstallCustom.PERFORM_CUSTOM_INSTALL()
ELSE
MdlInstallSys.PERFORM_FULL_INSTALL()
END IF
@@ -861,6 +861,6 @@
PUBLIC SUB process_error(msg AS String)
- sErr = sErr & gb.NewLine & sErr
+' sErr = sErr & gb.NewLine & sErr
PRINT MSG
END
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Oct 9 14:31:16 2008
@@ -223,6 +223,7 @@
DIM cbInclude AS CheckBox
DIM tl AS TextLabel
DIM sShortAddr AS String
+
x = 4
y = 4
@@ -348,7 +349,7 @@
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
WITH txtAppnd
- .Move(tl.Left + tl.Width + 8, tl.top,
FrmLilo.TabStrip1.Width - (tl.Width * 1.5))
+ .Move(tl.Left + tl.Width + 8, tl.top, tl.Width * 1.25)
.Height = 27
.tag = arrLinux[i]
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Thu Oct 9 14:31:16 2008
@@ -80,25 +80,7 @@
CASE "swap"
sCommand = "mkswap -L swap-space " & sAddr
END SELECT
-
- ' fix the form
-
- iMinFrameH = FrmInstallSys.tlCurrPkg.Height +
FrmInstallSys.tlCurrPkg2.Height + frminstallsys.tlCurrStepLbl.Height +
FrmInstallSys.pbInstallProg2.Height + FrmInstallSys.tlCurrStepLbl.Height +
36
- WITH FrmInstallSys
- .FrmProg.Move(4, .tlBanner.top + .tlBanner.Height + 8, .ClientWidth
- (.FrmProg.Left * 2), iMinFrameH)
- .tlBanner.Move(4, 16, .ClientWidth - (.tlBanner.Left * 2))
- '.tlBanner.Border = Border.Plain
- .FrmProg.Move(4, .tlBanner.top + (.tlBanner.Height +
8), .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)
-
- '.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
+
PRINT "Formatting " & sAddr & " to " & sFS
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Oct 9 14:31:16 2008
@@ -241,21 +241,7 @@
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")
|
