Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r66 - in branches/iVL: . .lang images
|
From: <cod...@go...> - 2008-07-21 21:58:12
|
Author: M0...@gm...
Date: Mon Jul 21 14:56:10 2008
New Revision: 66
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/FMain.class
branches/iVL/FMain.form
branches/iVL/FrmPkgSel.class
branches/iVL/FrmPkgSel.form
branches/iVL/FrmSelISO.class
branches/iVL/FrmSummary.class
branches/iVL/FrmSummary.form
branches/iVL/MdlCore.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlPkgSel.module
branches/iVL/MdlSetup.module
branches/iVL/MdlSummarize.module
branches/iVL/MdlWinDrives.module
branches/iVL/images/installer.png
branches/iVL/installer.gambas
Log:
+ R65
- Finished with install summary. Ready to begin installing packages... Finally
- Implemented installer logo on top (image may need to change, but the
code can stay the same)
- Fixed problem on ISO detection. In some cases, ISO's would not get listed.
This was due to a problem in the linux partition detection algorithm.
- Added function to read and set the selected partition types for linux partitions
- Fixed problem where MdlCore was listing an extra instance of one of
the combobox
items as residing in an empty cdrom volume.
- Added win partition listing to the install summary.
- Removed lag from the Fmain Start event. Now the form is fully
displayed, and a status label
states that the system is looking for installable media.
- Added better ISO recognition. It will now only list ISO images that
contain a SETUP.CONF.
This will hide any other ISO (Non-vector) WARNING: LIVE ISO'S ARE NOT
DETECTED. THIS IS DONE
INTENTIONALLY.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/.project
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsGlobal.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsPartSel.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsWinDrives.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:197
+#: FMain.class:209
msgid "Process Overview"
msgstr ""
-#: FMain.class:210
+#: FMain.class:223
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:220
+#: FMain.class:234
msgid "Next"
msgstr ""
-#: FMain.class:226
+#: FMain.class:240
msgid "Back"
msgstr ""
-#: FMain.class:232
+#: FMain.class:246
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmDiskPart.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmLicense.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartScheme.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartSel.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPkgSel.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSelISO.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSummary.class
+# /home/moises/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSummary.class:55
+#: FrmSummary.class:65
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmWinDrives.class
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlCore.module
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlDiskPart.module
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlObjSizer.module
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPartSel.module
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPkgSel.module
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSetup.module
+# /home/moises/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSummarize.module
+# /home/moises/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlWinDrives.module
+# /home/moises/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Jul 21 14:56:10 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.27
+Version=0.0.28
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Jul 21 14:56:10 2008
@@ -27,10 +27,18 @@
END
PUBLIC SUB Form_Open()
+DIM iImg AS Image
ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
FrmSelISO.Reparent(ME.pnlWinHost)
FrmSelISO.Width = pnlWinHost.Width
FrmSelISO.Height = pnlWinHost.Height
+iImg = Image.Load("images/installer.png").Stretch(600, 80)
+'iImg.Resize(600, 80)
+PictureBox1.Resize(iImg.Width, iImg.Height)
+PictureBox1.Picture = iImg.Picture
+
+PictureBox1.Stretch = TRUE
+
FrmSelISO.Show
MdlCore.PREPARE_INSTALL_LAYOUT
@@ -82,15 +90,17 @@
WITH ME
.tlBanner.width = ME.width
- .Frame1.Resize(MdlCore.iLeftWidth * 1.60, .ClientHeight -
tlBanner.Height - (.btback.Height * 1.5))
+ .Frame1.Move(4, .PictureBox1.top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth * 1.60, .ClientHeight - tlBanner.Height -
(.btback.Height * 1.5))
+ '.Frame1.Resize(MdlCore.iLeftWidth * 1.60, .ClientHeight -
tlBanner.Height - (.btback.Height * 1.5))
.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
- .pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlbanner.height + (.btback.height * 2)))
+ .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 2)))
.btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
- '.btback.Move(.pnlWinHost.Left, .pnlWinHost.Top
+ .pnlWinHost.Height - (.btback.Height),
MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
' we want that one right in the middle
.btQuit.Move(.pnlWinHost.Left + (.pnlWinHost.Width / 2) -
(.btQuit.Width / 2), .btback.top)
+ '.PictureBox1.Move(Desktop.Width / 2 - (.PictureBox1.Width / 2), 4)
+ .PictureBox1.Move(.ClientWidth / 2 - (.PictureBox1.Width / 2), 4)
END WITH
END
@@ -130,6 +140,8 @@
Message.Error("You must select a \"/\" partition. This is the
target where the system will install to")
STOP EVENT
ELSE
+ ' set the partition types
+ MdlPartSel.SET_LINUX_PARTITION_TYPES()
IF ClsPartSel.bDoWin = TRUE THEN
frmNext = FrmWinDrives
ELSE
@@ -149,8 +161,7 @@
MdlPkgSel.GET_USER_BULK_SELECTION()
frmNext = FrmPkgsel2
ELSE
- ' now we are ready to summarize
- Message("Going for a simple install")
+ ' Going for simple install. Now we are ready to summarize
MdlSummarize.SUMMARIZE_INSTALL
frmNext = FrmSummary
END IF
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Mon Jul 21 14:56:10 2008
@@ -13,28 +13,34 @@
}
{ tlBanner TextLabel
MoveScaled(0,0,26,7)
+ Visible = False
Font = Font["+6"]
Background = Color.SelectedBackground
Foreground = Color.SelectedForeground
Text = ("VectorLinux Install")
Alignment = Align.Center
+ Transparent = True
}
{ pnlWinHost VBox
MoveScaled(28,9,66,56)
}
{ btnext Button
- MoveScaled(49,67,8,3.1111)
+ MoveScaled(49,67,8,3.1)
Text = ("Next")
Picture = Picture["icon:/16/right"]
}
{ btback Button
- MoveScaled(28,67,8,3.1111)
+ MoveScaled(28,67,8,3.1)
Text = ("Back")
Picture = Picture["icon:/16/left"]
}
{ btQuit Button
- MoveScaled(38,67,11,3.1111)
+ MoveScaled(38,67,11,3.1)
Text = ("Exit")
Picture = Picture["icon:/16/cancel"]
+ }
+ { PictureBox1 PictureBox
+ MoveScaled(36,1,54,8)
+ Stretch = True
}
}
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Mon Jul 21 14:56:10 2008
@@ -36,7 +36,7 @@
.rbFull.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8,
MdlObjSizer.get_object_width(.rbfull.text) + 36)
.rbCustom.Move(.tlBanner.Left, .rbFull.top + .rbFull.Height + 4,
MdlObjSizer.get_object_width(.rbcustom.text) + 36)
.tlActionDesc.Width = .tlBanner.Width - 4
- .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top
+ .tlActionDesc.Height + 8, .tlActionDesc.Width - 12, .ClientHeight -
(.tlActionDesc.top + (.tlActionDesc.height * 2)))
+ .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top
+ .tlActionDesc.Height + 8, .tlActionDesc.Width - 12, .ClientHeight -
(.tlActionDesc.top + (.tlActionDesc.height * 2.75)))
END WITH
Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form (original)
+++ branches/iVL/FrmPkgSel.form Mon Jul 21 14:56:10 2008
@@ -17,10 +17,10 @@
Text = ("Custom Install")
}
{ tlActionDesc TextLabel
- MoveScaled(1,15,63,7)
+ MoveScaled(1,15,63,6)
Text = ("")
}
{ scrlInstallOpts ScrollView
- MoveScaled(1,24,52,28)
+ MoveScaled(1,22,52,28)
}
}
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Mon Jul 21 14:56:10 2008
@@ -58,16 +58,16 @@
' shape the main form according to the findings
'warn the user if no installable media was found
- IF FrmSelISO.lstInstallableImg.Count = 0 THEN
- FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
- FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any
installable media on your system. Please insert your VectorLinux " &
- "installation CD and click \'" & FrmSelISO.btResCan.Text & "\' to
try again"
- FMain.btnext.Enabled = FALSE
- FMain.btnext.ForeColor = Color.Gray
- ELSE
- FMain.btnext.Enabled = TRUE
- FMain.btnext.ForeColor = Color.Black
- END IF
+ ' ' IF FrmSelISO.lstInstallableImg.Count = 0 THEN
+ ' ' FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
+ ' ' FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any
installable media on your system. Please insert your VectorLinux " &
+ ' ' "installation CD and click \'" & FrmSelISO.btResCan.Text & "\'
to try again"
+ ' ' FMain.btnext.Enabled = FALSE
+ ' ' FMain.btnext.ForeColor = Color.Gray
+ ' ' ELSE
+ ' ' FMain.btnext.Enabled = TRUE
+ ' ' FMain.btnext.ForeColor = Color.Black
+ ' ' END IF
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Mon Jul 21 14:56:10 2008
@@ -25,6 +25,11 @@
.tlBanner.Adjust
.tlSummary.Adjust
END WITH
+
+ FMain.FrmCurr = ME
+ FMain.tvPlan["Inst0"].Selected = TRUE
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Inst0"].Picture = MdlCore.sNowPic
END
@@ -32,7 +37,10 @@
WITH ME
.tlBanner.Width = .ClientWidth - 4
- .tlSummary.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height +
4, .tlBanner.Width, .ClientH - 16)
+ .scrSumm.Move(.tlBanner.left, .tlBanner.top + .tlBanner.Height +
4, .tlBanner.Width - 32, .ClientHeight - .tlBanner.Height * 2)
+ .tlSummary.Move(4, 4)
+ '.tlSummary.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height
+ 4, .tlBanner.Width, .ClientH - 16)
+
END WITH
END
Modified: branches/iVL/FrmSummary.form
==============================================================================
--- branches/iVL/FrmSummary.form (original)
+++ branches/iVL/FrmSummary.form Mon Jul 21 14:56:10 2008
@@ -3,13 +3,18 @@
{ Form Form
MoveScaled(0,0,64,64)
Text = ("")
+ Arrangement = Arrange.Vertical
{ tlBanner TextLabel
MoveScaled(1,1,27,10)
Text = ("TextLabel1")
Alignment = Align.Left
}
- { tlSummary TextLabel
- MoveScaled(1,13,61,49)
- Text = ("TextLabel1")
+ { scrSumm ScrollView
+ MoveScaled(1,12,61,43)
+ Arrangement = Arrange.Vertical
+ { tlSummary TextLabel
+ MoveScaled(1,2,55,85)
+ Text = ("TextLabel1")
+ }
}
}
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Mon Jul 21 14:56:10 2008
@@ -46,11 +46,14 @@
sIso = Trim(sISOList[i])
SHELL "umount /mnt/loop" WAIT
SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/
sISO & Space(1) & "/mnt/loop" WAIT
- File.Save(Temp(siso), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
- SHELL "umount /mnt/loop" WAIT
- IF FrmSelISO.lstInstallableImg.Find(sISO & "
on " & sDrive) = -1 THEN
+ IF Exist("/mnt/loop/veclinux/SETUP.CONF") =
TRUE THEN
+ IF FrmSelISO.lstInstallableImg.Find(sISO
& " on " & sDrive) = -1 THEN
+ File.Save(Temp(siso), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
FrmSelISO.lstInstallableImg.Add(sISO & " on "
& sDrive)
END IF
+ END IF
+ SHELL "umount /mnt/loop" WAIT
+
NEXT
SHELL "umount " & ClsGlobal.sSourceMnt WAIT
@@ -90,9 +93,10 @@
DIM sPartition AS String
'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \'
\'" TO sResults
- SHELL " /sbin/probepart | grep -e \" *Linux$\" | cut -f 1 -d \' \' |
grep -e \" /dev\"" TO sResults
+ SHELL "/sbin/probepart | grep -e \" Linux$\" | cut -f 1 -d \' \' |
grep /dev" TO sResults
+
sResults = Trim(sResults)
- 'Message.Info(sResults)
+ 'Message.Info(sResults)
IF InStr(sResults, gb.NewLine) THEN
sPartList = Split(sResults, gb.NewLine)
FOR i = 0 TO sPartList.count - 1
@@ -120,7 +124,6 @@
DIM sDump AS String
DIM i AS Integer
-
ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
sMountPoint = ClsGlobal.sSourceMnt
@@ -153,7 +156,8 @@
END IF
- SHELL "umount /dev/" & sDrive WAIT
+ SHELL "umount " & sMountPoint WAIT
+ 'SHELL "umount /dev/" & sDrive WAIT
'SHELL "umount " & sDrive WAIT
NEXT
@@ -177,15 +181,12 @@
END IF
'SHELL "umount /dev/" & clsglobal.sSourceMnt WAIT
SHELL "umount " & ClsGlobal.sSourceMnt WAIT
-
-
-
-
+
+
END IF
- 'NOW SEARCH FOR ISOS ON THE DRIVES
- ME.SCAN_LINUX_PARTITIONS()
+
@@ -194,15 +195,37 @@
PUBLIC SUB main()
-
- ME.MEDIA_SCAN
FMain.Show
- FMain.SkipTaskbar = TRUE
- FMain.Maximized = TRUE
- FMain.Resize(Desktop.Width, Desktop.Height)
+' FMain.Maximized = TRUE
+' FMain.Resize(Desktop.Width, Desktop.Height)
'FMain.tvPlan.MoveTo("Prep0")
FMain.tvPlan["Prep0"].Selected = TRUE
-
+'Balloon("Scanning drives for media ... please wait", fmain.pnlWinHost)
+FrmSelISO.tlDistroDesc.Text = "<b>Scanning system for installable
media. Please wait ...</b>"
+
+WAIT 1
+ FrmSelISO.lstInstallableImg.Enabled = FALSE
+ FrmSelISO.btResCan.Enabled = FALSE
+ fmain.btnext.Enabled = FALSE
+ fmain.btQuit.Enabled = FALSE
+ ME.SCAN_LINUX_PARTITIONS() ' find ISO's on the drives first
+ ME.MEDIA_SCAN
+ FrmSelISO.lstInstallableImg.Enabled = TRUE
+ FrmSelISO.btResCan.Enabled = TRUE
+ fmain.btnext.Enabled = TRUE
+ fmain.btQuit.Enabled = TRUE
+ IF FrmSelISO.lstInstallableImg.Count = 0 THEN
+ FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
+ FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any
installable media on your system. Please insert your VectorLinux " &
+ "installation CD and click \'" & FrmSelISO.btResCan.Text & "\' to
try again"
+ FMain.btnext.Enabled = FALSE
+ FMain.btnext.ForeColor = Color.Gray
+ ELSE
+ FMain.btnext.Enabled = TRUE
+ FMain.btnext.ForeColor = Color.Black
+ END IF
+
+
' FMain.tvPlan["Prep0"].Selected
END
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Mon Jul 21 14:56:10 2008
@@ -309,22 +309,25 @@
PUBLIC SUB fsTypes_click()
DIM cb AS ComboBox
-
-IF LAST.text = "Do not format"
- FOR EACH cb IN oMountPoints
- IF cb.tag = LAST.tag AND cb.text = "/" THEN
- Message.Error("The / partition MUST be formatted no matter
what. Please select a filesystem for this partition")
- 'default it to xfs
- LAST.text = "XFS"
- STOP EVENT
- END IF
- NEXT
- END IF
-
- 'PRINT "format " & LAST.tag & " as " & LAST.text
-
- ME.SET_PARTITION_FORMAT(LAST.tag, LAST.text)
-
+ FOR EACH cb IN oMountPoints
+ IF cb.Tag = LAST.tag THEN
+ SELECT CASE cb.Text
+ CASE "/"
+ ClsPartSel.fRoot = LAST.text
+ CASE "/home"
+ ClsPartSel.fhome = LAST.text
+ CASE "/var"
+ ClsPartSel.fVar = LAST.text
+ CASE "/tmp"
+ ClsPartSel.fTmp = LAST.text
+ CASE "/opt"
+ ClsPartSel.fOpt = LAST.text
+ CASE "/usr"
+ ClsPartSel.fUsr = LAST.text
+ END SELECT
+ END IF
+ NEXT
+
END
@@ -333,37 +336,70 @@
SELECT CASE sMountPoint
CASE "/"
FrmPartSel.sRootAddr = SPartition
+ ClsPartSel.sRoot = SPartition
CASE "/home"
FrmPartSel.sHomeAddr = SPartition
+ ClsPartSel.sHome = SPartition
CASE "/opt"
FrmPartSel.sOptAddr = SPartition
+ ClsPartSel.sOpt = SPartition
CASE "/usr"
FrmPartSel.sUsrAddr = SPartition
+ ClsPartSel.sUsr = SPartition
CASE "/var"
FrmPartSel.sVarAddr = SPartition
+ ClsPartSel.sVar = SPartition
CASE "/tmp"
FrmPartSel.sTmpAddr = SPartition
+ ClsPartSel.sTmp = SPartition
END SELECT
END
+PUBLIC SUB SET_LINUX_PARTITION_TYPES()
+
+ DIM cb AS ComboBox
+ DIM cc AS ComboBox
+ FOR EACH cb IN oMountPoints
+ FOR EACH cc IN oFsTypes
+ IF cb.tag = cc.tag THEN
+ ME.SET_PARTITION_FORMAT(cb.text, cc.Text)
+ END IF
+ NEXT
+ NEXT
+
+
+
+
+END
+
+
+
+
PUBLIC SUB SET_PARTITION_FORMAT(sMountPoint AS String, sFormat AS String)
SELECT CASE sMountPoint
CASE "/"
FrmPartSel.sRootFrmt = sFormat
+ ClsPartSel.fRoot = sFormat
CASE "/home"
FrmPartSel.sHomeFrmt = sFormat
+ ClsPartSel.fHome = sFormat
CASE "/opt"
FrmPartSel.sOptFrmt = sFormat
+ ClsPartSel.fOpt = sFormat
CASE "/usr"
FrmPartSel.sUsrFrmt = sFormat
+ ClsPartSel.fUsr = sFormat
CASE "/var"
FrmPartSel.sVarFrmt = sFormat
+ ClsPartSel.fVar = sFormat
CASE "/tmp"
FrmPartSel.sTrmFrmt = sFormat
+ ClsPartSel.fTmp = sFormat
END SELECT
-
+ 'Message("Set " & sMountPoint & " as " & sFormat)
+ 'Message(ClsPartSel.sRoot & ClsPartSel.fRoot)
END
Modified: branches/iVL/MdlPkgSel.module
==============================================================================
--- branches/iVL/MdlPkgSel.module (original)
+++ branches/iVL/MdlPkgSel.module Mon Jul 21 14:56:10 2008
@@ -112,7 +112,10 @@
PUBLIC SUB Packages_click()
- 'Message(LAST.tag)
+ IF ClsPkgSel.arrPkgs THEN
+ ClsPkgSel.arrPkgs.Clear
+ END IF
+ ME.GET_USER_PKG_SELECTION()
END
@@ -142,22 +145,44 @@
IF cb.Value = TRUE THEN
ClsPkgSel.arrBulks.Add(cb.tag)
END IF
- NEXT
+ NEXT ' just store them to the array for now. We will read the
array at install time
- FOR i = 0 TO ClsPkgSel.arrBulks.count - 1
- sItem = ClsPkgSel.arrBulks[i]
- IF sItem LIKE " " THEN
- ClsPkgSel.arrBulks.Delete(ClsPkgSel.arrBulks.Find(sItem))
- ELSE
- sList = sList & ", " & sItem
- ENDIF
- NEXT
- IF Left(sList) = "," THEN
- sList = Right(sList, Len(sList) - 1)
- ELSE IF Right(sList) = "," THEN
- sList = Left(sList, Len(sList) - 1)
- END IF
- sList = Trim(sList)
-
+ ' ' FOR i = 0 TO ClsPkgSel.arrBulks.count - 1
+ ' ' sItem = ClsPkgSel.arrBulks[i]
+ ' ' IF sItem LIKE " " THEN
+ ' ' ClsPkgSel.arrBulks.Delete(ClsPkgSel.arrBulks.Find(sItem))
+ ' ' ELSE
+ ' ' sList = sList & ", " & sItem
+ ' ' ENDIF
+ ' ' NEXT
+ ' ' IF Left(sList) = "," THEN
+ ' ' sList = Right(sList, Len(sList) - 1)
+ ' ' ELSE IF Right(sList) = "," THEN
+ ' ' sList = Left(sList, Len(sList) - 1)
+ ' ' END IF
+ ' ' sList = Trim(sList)
+ ' '
END
+
+PUBLIC SUB GET_USER_PKG_SELECTION()
+
+ DIM cb AS CheckBox
+ DIM sList, sItem AS String
+ DIM i AS Integer
+ ' simply get the list of packages into the array, and we will read
the array while installing packages.
+ ClsPkgSel.arrPkgs = NEW String[]
+ FOR EACH cb IN ME.Pkgs
+ IF cb.value = TRUE THEN
+ ClsPkgSel.arrPkgs.Add(cb.Tag)
+ END IF
+ NEXT
+
+
+
+
+
+
+
+END
+
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Mon Jul 21 14:56:10 2008
@@ -274,13 +274,7 @@
ClsPartSel.sSwap & Space(5) & "none" & Space(5) & "swap" & Space(5)
& "sw" & Space(5) & "0" & Space(5) & "0"
END IF
' Wheewww!... that's the whole fstab there... Please fix the win partitions
-
-
-
-
-
-
-
+
Modified: branches/iVL/MdlSummarize.module
==============================================================================
--- branches/iVL/MdlSummarize.module (original)
+++ branches/iVL/MdlSummarize.module Mon Jul 21 14:56:10 2008
@@ -18,9 +18,13 @@
PUBLIC SUB SUMMARIZE_INSTALL()
DIM sText AS String
+DIM i AS Integer
+ ' read each partition type
+ MdlPartSel.SET_LINUX_PARTITION_TYPES()
+ 'Message(ClsPartSel.fRoot)
- sText = "PARTITIONING LAYOUT:<br>" &
+ sText = "<b><br>PARTITIONING LAYOUT:</b><br>" &
ClsPartSel.sRoot & " = / (" & ClsPartSel.fRoot & ")<br>"
'"/ = " & ClsPartSel.sRoot & " <br>"
IF ClsPartSel.sHome THEN
@@ -39,25 +43,59 @@
sText = sText & ClsPartSel.sVar & " = /var (" & ClsPartSel.sVar & ")<br>"
END IF
- sText = sText & "<br><br><br><br>"
+ sText = sText & "<br><br>"
IF ClsWinDrives.sWinDrives THEN
- sText = sText & "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME.<br>"
+ sText = sText & "<b>OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT
BOOT TIME.</b><br>"
'list all the windows partitions here
+ sText = sText & ME.LIST_WINDOWS_PARTITIONS() & "<bb><br>"
END IF
IF ClsPkgSel.bCustom = TRUE THEN
- sText = sText & "INSTALL TYPE: Custom<br>"
+ sText = sText & "<b>INSTALL TYPE:</b> Custom<br>"
+
+ sText = sText & "<br><b>BULK PACKAGES:</b> "
+ FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
+ sText = sText & "<br>" & Right(ClsPkgSel.arrBulks[i],
Len(ClsPkgSel.arrBulks[i]) - RInStr(ClsPkgSel.arrBulks[i], "/"))
+ NEXT
+ sText = sText & "<br><br><b>OPTIONAL PACKAGES:</b>"
+ FOR i = 0 TO ClsPkgSel.arrPkgs.Count - 1
+ sText = sText & "<br>" & Right(ClsPkgSel.arrPkgs[i],
Len(ClsPkgSel.arrPkgs[i]) - RInStr(ClsPkgSel.arrPkgs[i], "/"))
+ NEXT
+
ELSE
- sText = sText & "INSTALL TYPE: Full<br>"
+ sText = sText & "<b>INSTALL TYPE:</b> Full<br>"
END IF
-
-
-
-
-
+
+
+
+
FrmSummary.tlSummary.Text = sText
+
END
+
+ PUBLIC FUNCTION LIST_WINDOWS_PARTITIONS() AS String
+
+ DIM sPart, sMntPnt, sLine, sRet, sNewLine AS String
+ DIM i AS Integer
+ IF ClsWinDrives.sWinDrives THEN
+ FOR i = 0 TO ClsWinDrives.sWinDrives.Count - 1
+ sLine = ClsWinDrives.sWinDrives[i]
+ spart = Trim(Left(sLine, InStr(sLine, "|") - 1))
+ sMntPnt = Right(sLine, Len(sLine) - InStr(sLine, "|"))
+ sRet = sRet & gb.NewLine & spart & " will be mounted to " & sMntPnt
+ 'Message.Info(sLine)
+ NEXT
+ sRet = Trim(sRet)
+ RETURN sRet
+ END IF
+
+
+
+
+
+END
+
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Mon Jul 21 14:56:10 2008
@@ -209,6 +209,7 @@
DIM sLine AS String
FOR i = 0 TO ClsWinDrives.sWinDrives.Count - 1
sLine = ClsWinDrives.sWinDrives[i]
+ 'FORMAT: <partition_address>|<mount_point>
IF Left(sLine, InStr(sLine, "|") - 1) = sTag THEN
sLine = sTag & "|" & sMntPoint
PRINT sLine
Modified: branches/iVL/images/installer.png
==============================================================================
Binary files. No diff available.
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
