Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r64 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-07-21 01:35:53
|
Author: M0...@gm...
Date: Sun Jul 20 18:34:19 2008
New Revision: 64
Modified:
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/FrmPkgsel2.class
branches/iVL/FrmPkgsel2.form
branches/iVL/FrmWinDrives.class
branches/iVL/MdlCore.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlWinDrives.module
branches/iVL/installer.gambas
Log:
Small cosmetic fixes. Updated navigation procedure. More progress in
the summary to make the jump to install.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsGlobal.class
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsPartSel.class
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsWinDrives.class
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FMain.class
+# /home/vluser/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:198
+#: FMain.class:197
msgid "Process Overview"
msgstr ""
-#: FMain.class:211
+#: FMain.class:210
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:221
+#: FMain.class:220
msgid "Next"
msgstr ""
-#: FMain.class:227
+#: FMain.class:226
msgid "Back"
msgstr ""
-#: FMain.class:233
+#: FMain.class:232
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmDiskPart.class
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmLicense.class
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartScheme.class
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartSel.class
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPkgSel.class
+# /home/vluser/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPkgSel.class:84
+#: FrmPkgSel.class:88
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:90
+#: FrmPkgSel.class:94
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:95
+#: FrmPkgSel.class:99
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSelISO.class
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSummary.class
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmWinDrives.class
+# /home/vluser/area-51/projects/installer/FrmWinDrives.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"
-#: FrmWinDrives.class:65
+#: FrmWinDrives.class:66
msgid "Select the windows partitions you would like to mount during boot"
msgstr ""
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlCore.module
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlDiskPart.module
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlObjSizer.module
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPartSel.module
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPkgSel.module
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSetup.module
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSummarize.module
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlWinDrives.module
+# /home/vluser/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 Sun Jul 20 18:34:19 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.18
+Version=0.0.26
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Sun Jul 20 18:34:19 2008
@@ -82,15 +82,11 @@
WITH ME
.tlBanner.width = ME.width
- '.Frame1.Move(.tlBanner.left + 4, .tlBanner.Top + .tlBanner.Height
+ 4, .tlBanner.Width - ((.tlBanner.Width / 10) * 7), .Height -
(.tlbanner.height + (.tlbanner.height / 2)))
.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))
- '.tvPlan.Resize(.Frame1.Width - (.Frame1.Width / 20),
Frame1.Height - (.Frame1.Height / 20))
- '.tvPlan.Resize(.Frame1.Width - 20, .Frame1.Height - 36)
- '.tvPlan.Width = MdlCore.iLeftWidth + (MdlCore.iLeftWidth / 20)
- '.Frame1.Width = .tvPlan.Width + (.tvPlan.Width / 20)
.pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlbanner.height + (.btback.height * 2)))
- .btback.Move(.pnlWinHost.Left, .pnlWinHost.Top
+ .pnlWinHost.Height - (.btback.Height),
MdlObjSizer.get_object_width(.btback.text) + 36)
+ .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
@@ -163,6 +159,9 @@
MdlSummarize.SUMMARIZE_INSTALL
frmNext = FrmSummary
'frmNext = install
+ CASE "FrmWinDrives"
+ 'Move on to selecting packages
+ frmNext = FrmPkgSel
END SELECT
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Sun Jul 20 18:34:19 2008
@@ -23,17 +23,17 @@
MoveScaled(28,9,66,56)
}
{ btnext Button
- MoveScaled(89,69,8,3.1667)
+ MoveScaled(49,67,8,3.1111)
Text = ("Next")
Picture = Picture["icon:/16/right"]
}
{ btback Button
- MoveScaled(28,67,8,3.1667)
+ MoveScaled(28,67,8,3.1111)
Text = ("Back")
Picture = Picture["icon:/16/left"]
}
{ btQuit Button
- MoveScaled(54,67,11,3.1667)
+ MoveScaled(38,67,11,3.1111)
Text = ("Exit")
Picture = Picture["icon:/16/cancel"]
}
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Sun Jul 20 18:34:19 2008
@@ -23,6 +23,10 @@
.rbFull_Click()
END WITH
FMain.FrmCurr = ME
+ FMain.tvPlan["Prep2"].Selected = TRUE
+ FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
+
END
PUBLIC SUB Form_Resize()
@@ -32,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, .ClientHeight -
(.tlActionDesc.top + (.tlActionDesc.height * 1.5)))
+ .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top
+ .tlActionDesc.Height + 8, .tlActionDesc.Width - 12, .ClientHeight -
(.tlActionDesc.top + (.tlActionDesc.height * 2)))
END WITH
Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form (original)
+++ branches/iVL/FrmPkgSel.form Sun Jul 20 18:34:19 2008
@@ -9,18 +9,18 @@
Alignment = Align.Normal
}
{ rbFull RadioButton
- MoveScaled(1,8,40,4.5)
+ MoveScaled(1,8,40,3)
Text = ("Full Install")
}
{ rbCustom RadioButton
- MoveScaled(1,14,55,4.5)
+ MoveScaled(1,11,55,3)
Text = ("Custom Install")
}
{ tlActionDesc TextLabel
- MoveScaled(1,21,63,7)
+ MoveScaled(1,15,63,7)
Text = ("")
}
{ scrlInstallOpts ScrollView
- MoveScaled(1,30,52,28)
+ MoveScaled(1,24,52,28)
}
}
Modified: branches/iVL/FrmPkgsel2.class
==============================================================================
--- branches/iVL/FrmPkgsel2.class (original)
+++ branches/iVL/FrmPkgsel2.class Sun Jul 20 18:34:19 2008
@@ -32,13 +32,8 @@
WITH ME
.tlbanner.Width = .ClientWidth - 16
- '.tlbanner.Move(.ClientX + 4, .clienty + 4, .ClientWidth - 18)
- '.tlbanner.Move(4, 16, FrmPartSel.scrollPartitions.Width - 60)
- .scrPkgs.Move(.tlbanner.Left, .tlbanner.top + (.tlbanner.Height *
2), .tlbanner.Width - 4, .ClientH - (.tlbanner.Height *
1.5)) ', .tlbanner.Width - 8, .ClientHeight - .tlbanner.height - 8)
- '.scrPkgs.Resize(FrmPkgSel.scrlInstallOpts.Width, .ClientHeight - (.tlbanner.Height))
-' .VPanel1.Move(2, .tlbanner.Height * 2)
- '.scrPkgs.Width = .tlbanner.Width
- '.scrPkgs.Height = .ClientHeight - .tlbanner.Height - 4
+ .scrPkgs.Move(.tlbanner.Left, .tlbanner.top + (.tlbanner.Height *
1.5), .tlbanner.Width - 4, .ClientHeight - (.tlbanner.Height *
4)) ', .tlbanner.Width - 8, .ClientHeight - .tlbanner.height - 8)
+
END WITH
END
@@ -53,6 +48,12 @@
END WITH
FMain.FrmCurr = ME
MdlPkgSel.LIST_PACKAGE_SELECTION()
+
+
+END
+
+PUBLIC SUB scrPkgs_MouseDown()
+
END
Modified: branches/iVL/FrmPkgsel2.form
==============================================================================
--- branches/iVL/FrmPkgsel2.form (original)
+++ branches/iVL/FrmPkgsel2.form Sun Jul 20 18:34:19 2008
@@ -4,7 +4,7 @@
MoveScaled(0,0,64,64)
Text = ("")
{ tlbanner TextLabel
- MoveScaled(1,1,23,6)
+ MoveScaled(1,1,43,5)
Text = ("TextLabel1")
}
{ scrPkgs ScrollView
Modified: branches/iVL/FrmWinDrives.class
==============================================================================
--- branches/iVL/FrmWinDrives.class (original)
+++ branches/iVL/FrmWinDrives.class Sun Jul 20 18:34:19 2008
@@ -21,6 +21,7 @@
ME.Resize(ME.ClientWidth - 12, ME.ClientH - 12)
MdlWinDrives.LIST_WIN_PARTITIONS
'ME.Resize(ME.Parent.Width - 12, ME.Parent.Height - 12)
+ FMain.FrmCurr = ME
END
@@ -30,7 +31,7 @@
WITH ME
.tlBanner.Width = .ClientW - 4
'.svWinDrives.Resize(.ClientWidth - 4, .ClientHeight -
(.tlBanner.Width * 1.5))
- .svWinDrives.Move(.tlBanner.Left, .tlBanner.top +
(.tlBanner.Height + 4), .tlBanner.Width - 8, .ClientH -
(.tlbanner.height * 2))
+ .svWinDrives.Move(.tlBanner.Left, .tlBanner.top +
(.tlBanner.Height + 4), .tlBanner.Width - 20, .ClientH -
(.tlbanner.height * 2))
END WITH
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Sun Jul 20 18:34:19 2008
@@ -444,8 +444,8 @@
.Add("Prep", "Preparation", sCatPic)
.Add("Prep0", "Find installation media", sNowPic, "Prep")
.Add("Prep1", "Disk Partitioning", sToDopic, "Prep")
- .Add("Prep2", "Regional Setup", sToDopic, "Prep")
- .Add("Prep3", "Desktop Selection", sToDopic, "Prep")
+ .Add("Prep2", "Software Selection", sToDopic, "Prep")
+ '.Add("Prep3", "Desktop Selection", sToDopic, "Prep")
.Add("Inst", "Installation", sCatPic)
.Add("Inst0", "Installation Summary", sToDopic, "Inst")
.Add("Inst1", "Install Operating System", sToDopic, "Inst")
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Sun Jul 20 18:34:19 2008
@@ -184,7 +184,7 @@
spart = Trim(sSwapList)
'SHELL "export " & sSwapList & "=$(df -h | grep -i swap) |
cut -f 2 -d \' \'" TO vSwapSize
SHELL " export sw=$(probepart | grep -i \" *swap$\") && echo
$sw | cut -f 4 -d \' \'" TO vSwapSize
-
+
iswapsize = CInt(vSwapSize)
iswapsize = Round(iswapsize / 1024 / 1024, -2)
'now create the swap label and combo box
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Sun Jul 20 18:34:19 2008
@@ -57,12 +57,31 @@
.Height = 27
.Width = MdlObjSizer.get_object_width(.Text)
.x = FrmWinDrives.svWinDrives.Width / 2 - (.Width / 2)
-
.y = y
cbx = .x + .Width - (.Width / 2)
END WITH
- y = y + tl.Height * 2
+
+ y = y + tl.Height + 8
+ tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "Headers"
+ WITH tl
+ .x = x
+ .y = y
+ .text = "<B>PARTITION</B>"
+ .Width = MdlObjSizer.get_object_width(.Text) * 1.5
+ .Height = 27
+ END WITH
+ cbx = x + (tl.Width) * 2
+ tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "Headers"
+ WITH tl
+ .x = cbx
+ .y = y
+ .text = "<b>MOUNT TO </B>"
+ .Width = MdlObjSizer.get_object_width(.Text) * 1.5
+ .Height = 27
+ END WITH
+ y = y + tl.Height + 8
+
'END IF
IF InStr(sDump1, gb.NewLine) THEN ' more than one partition found
sPartList = Split(sDump1, gb.NewLine) ' multiple partitions found
@@ -87,9 +106,9 @@
.Width = MdlObjSizer.get_object_width(.Text) ' * 1.5
.Tag = sPartList[i]
.Height = 27
- .x = FrmPartSel.tlPartRow.Left
+ .x = x 'FrmPartSel.tlPartRow.Left
.y = y
- cbx = .x + tl.Width * 1.5
+
IF .Width > lbwidth THEN
lbwidth = .Width
ELSE
@@ -107,17 +126,18 @@
.Tag = sPartList[i]
.Height = 27
'.x = FrmPartSel.scrollPartitions.Width /
2 'lbwidth + 12
- .x = FrmPartSel.tlPartRow2.Left
+ .x = cbx 'x + tl.Width + 8 'FrmPartSel.tlPartRow2.Left
.y = tl.Top
.Add("/mnt" &/ sPart)
- .Width = MdlObjSizer.get_object_width("/mnt" &/
sPart) * 2
+ .Add("Do not mount")
+ .Width = MdlObjSizer.get_object_width("Do not
mount") * 2
.ReadOnly = FALSE
' .border = border.Plain
ME.oWMntPoints.Add(cb)
END WITH
y = y + tl.Height + 4
-
+ '
NEXT
@@ -182,10 +202,6 @@
ME.UPDATE_WIN_ARRAY(LAST.tag, Trim(LAST.text))
END
-
-
-
-
PUBLIC SUB UPDATE_WIN_ARRAY(sTag AS String, sMntPoint AS String)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
