Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r51 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-07-18 16:50:55
|
Author: M0E.lnx
Date: Fri Jul 18 09:49:47 2008
New Revision: 51
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.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/FrmSelISO.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FMain.form
branches/iVL/FrmPartSel.class
branches/iVL/MdlCore.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
Modified Fmain resize event to make the left panel look just the right
size (determined by the largest child text). Updated binary.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Fri Jul 18 09:49:47 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 Fri Jul 18 09:49:47 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/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Jul 18 09:49:47 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:151
+#: FMain.class:172
msgid "Process Overview"
msgstr ""
-#: FMain.class:164
+#: FMain.class:185
msgid "Vector Linux Install"
msgstr ""
-#: FMain.class:174
+#: FMain.class:195
msgid "Next"
msgstr ""
-#: FMain.class:180
+#: FMain.class:201
msgid "Back"
msgstr ""
-#: FMain.class:186
+#: FMain.class:207
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Fri Jul 18 09:49:47 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 Fri Jul 18 09:49:47 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 Fri Jul 18 09:49:47 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 Fri Jul 18 09:49:47 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.
@@ -14,27 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:143
+#: FrmPartSel.class:146
msgid "Define where the operating system will be
installed\n<br>\nLinux is a modular operating system. This means that
it has the ability to keep system and user data separately.<br> A
recommended setup would included a / (root), a /home, and a swap
partitions.\n<br>\nPlease select which partitions you would like to use
for your install"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:154
msgid "<b>Partition</b>"
msgstr ""
-#: FrmPartSel.class:157
+#: FrmPartSel.class:160
msgid "<b>Mount Point</b>"
msgstr ""
-#: FrmPartSel.class:163
+#: FrmPartSel.class:166
msgid "<b>File System</b>"
msgstr ""
-#: FrmPartSel.class:170
+#: FrmPartSel.class:173
msgid "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"
msgstr ""
-#: FrmPartSel.class:171
+#: FrmPartSel.class:174
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Fri Jul 18 09:49:47 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/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Fri Jul 18 09:49:47 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 Fri Jul 18 09:49:47 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 Fri Jul 18 09:49:47 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 Fri Jul 18 09:49:47 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/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Fri Jul 18 09:49:47 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/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Jul 18 09:49:47 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.2
+Version=0.0.8
Library=gb.gtk
Library=gb.form
Library=gb.desktop
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Fri Jul 18 09:49:47 2008
@@ -39,10 +39,26 @@
.btQuit.Text = "Exit Installation"
END WITH
'ME.TreeView1.BackColor = Color.Transparent
+ME.AUTOSIZE_LEFT_PANE
+END
+PUBLIC SUB AUTOSIZE_LEFT_PANE()
+
+ DIM iWidth AS Integer
+ ' this will find widest child in treeview
+ ME.tvPlan.MoveFirst()
+ REPEAT
+ IF MdlObjSizer.get_object_width(tvPlan.Item.Text) > iWidth THEN
+ iWidth = MdlObjSizer.get_object_width(tvPlan.item.Text)
+ END IF
+ UNTIL ME.tvPlan.MoveBelow()
+
+ ME.tvPlan.Width = iWidth + (iWidth / 20)
+ ME.Frame1.Width = iWidth + (iWidth / 10)
END
+
PUBLIC SUB ComboBox1_Click()
@@ -59,15 +75,20 @@
WITH ME
.btQuit.Width = MdlObjSizer.get_object_width(.btQuit.Text) + 36
END WITH
-
+ 'ME.AUTOSIZE_LEFT_PANE
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)))
- .tvPlan.Resize(.Frame1.Width - 20, .Frame1.Height - 36)
+ '.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, 30, .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), .Frame1.Height)
.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
+ 4), .btback.Top, MdlObjSizer.get_object_width(.btnext.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)
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Fri Jul 18 09:49:47 2008
@@ -7,7 +7,7 @@
MoveScaled(1,8,25,62)
Text = ("Process Overview")
{ tvPlan TreeView
- MoveScaled(1,3,22,56)
+ MoveScaled(1,2,22,56)
Border = False
}
}
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Fri Jul 18 09:49:47 2008
@@ -40,8 +40,11 @@
.scrollPartitions.Resize(.ClientWidth - 12, .ClientHeight
- .tlBanner.Height - (cbDoWin.Height * 2))
.cbDoWin.Move(.scrollPartitions.Left, .ClientHeight
- .cbDoWin.Height - 8)
.tlPartRow.Move(4, 4)
- .tlPartRow3.Move(ME.scrollPartitions.Left +
ME.scrollPartitions.Width - (.tlPartRow3.Width * 2), .tlpartrow.top)
- .tlPartRow2.Move((.tlPartRow.Width + .tlPartRow3.Left) / 3, tlpartrow.top)
+ .tlPartRow2.Move(.tlPartRow.Left + (.tlPartRow.Width * 1.5), .tlPartRow.top)
+ .tlPartRow3.Move(.tlPartRow2.left + (.tlPartRow3.Width * 1.5), .tlPartRow.top)
+ ' .tlPartRow.Move(4, 4)
+ ' .tlPartRow3.Move(ME.scrollPartitions.Left +
ME.scrollPartitions.Width - (.tlPartRow3.Width * 2), .tlpartrow.top)
+ ' .tlPartRow2.Move((.tlPartRow.Width + .tlPartRow3.Left) / 3, tlpartrow.top)
END WITH
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Fri Jul 18 09:49:47 2008
@@ -23,6 +23,7 @@
PUBLIC sToDopic AS Picture = Picture["images/circle.png"]
PUBLIC sNowPic AS picture = Picture["images/arrow.png"]
PUBLIC sDonePic AS Picture = Picture["images/check.png"]
+PUBLIC iLeftWidth AS Integer
@@ -375,7 +376,7 @@
DIM iRoot AS Variant
DIM iswap AS Variant
DIM ihome AS Variant
-
+ DIM iWidth AS Integer
ClsGlobal.sBulkList = ""
ClsGlobal.sConfPkg = ""
'drive should already be mounted
@@ -432,6 +433,7 @@
PUBLIC SUB PREPARE_INSTALL_LAYOUT()
+DIM iWidth AS Integer
WITH FMain.tvPlan
.Add("Prep", "Preparation", sCatPic)
.Add("Prep0", "Find installation media", sNowPic, "Prep")
@@ -453,44 +455,17 @@
FMain.tvPlan.MoveFirst()
REPEAT
FMain.tvPlan.Item.Expanded = TRUE
+ IF MdlObjSizer.get_object_width(FMain.tvPlan.Item.Text) > iWidth THEN
+ iWidth = MdlObjSizer.get_object_width(FMain.tvPlan.Item.Text)
+ END IF
UNTIL FMain.tvPlan.MoveBelow()
-
-
-
-' '
-' ' DIM sLabel AS TextLabel
-' ' DIM X AS Integer
-' ' DIM y AS Integer
-' ' DIM pPic AS PictureBox
-' ' DIM sPrepList AS String = "Find Install Media, License Agreement, Install"
-' ' DIM sPrepArr AS String[] = Split(sPrepList, ",")
-' ' DIM sCurrStep AS String
-' ' DIM i AS Integer
-' '
-' ' 'first category
-' ' X = FMain.ScrollView1.X
-' ' Y = FMain.ScrollView1.y + 4
-' ' FOR i = 0 TO sPrepArr.Count - 1
-' ' sCurrStep = Trim(sPrepArr[i])
-' ' sLabel = NEW TextLabel(FMain.ScrollView1) AS "Preps"
-' ' WITH sLabel
-' ' '.Width = .Parent.Width
-' ' .x = x + 4
-' ' .y = Y + 4
-' ' .Text = sCurrStep
-' ' .Width = MdlObjSizer.get_object_width(.Text)
-' ' .Height = 27
-' '
-' ' END WITH
-' ' y = y + sLabel.Height
-' ' NEXT
-' '
-' '
-' '
-' '
+ iLeftWidth = iWidth
+ fmain.tvPlan.Width = iWidth + (iWidth / 20)
+ fmain.Frame1.Width = iWidth + (iWidth / 10)
+
+
-
END
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Fri Jul 18 09:49:47 2008
@@ -133,6 +133,8 @@
PUBLIC SUB MOUNT_DEFINED_PARTITIONS()
+
+
' this is where we need to set the mount target
ClsGlobal.sTargetMnt = "/mnt/target"
@@ -186,7 +188,9 @@
DIM sPartition AS String
DIM sMountPoint AS String
DIM sMntOpts AS String
-
+ DIM i AS Integer
+ DIM sWinPart AS String
+ DIM sWinMntPnt AS String
DIM sFstab AS String
sFstab = "# /etc/fstab: static file system information.\n" &
@@ -226,7 +230,17 @@
"# Shared Windows/Linux partition" &
"#/dev/hda1 /mnt/dos msdos umask=0 0 0 \n" &
"#/dev/hda1 /mnt/win vfat
fmask=111,dmask=0,quiet,shortname=mixed,user 0 0 \n" &
-"#/dev/hda1 /mnt/win ntfs umask=0 0 0\n" &
+"#/dev/hda1 /mnt/win ntfs umask=0 0 0\n"
+ IF ClsWinDrives.sWinDrives THEN
+ FOR i = 0 TO ClsWinDrives.sWinDrives.Count - 1
+ sWinPart = Trim(Left(ClsWinDrives.sWinDrives[i],
InStr(ClsWinDrives.sWinDrives[i], "|") - 1))
+ sWinMntPnt = Trim(Right(ClsWinDrives.sWinDrives[i],
Len(ClsWinDrives.sWinDrives[i]) - InStr(ClsWinDrives.sWinDrives[i], "|")))
+ Message("Mount " & sWinPart & " to " & sWinMntPnt)
+ ' if this is right... then add it to the file
+ NEXT
+ END IF
+
+sFstab = sFstab & "\n\n" &
"# Floppy disks \n" &
"# The 'noauto' option indicates that the file system should not be
mounted \n" &
"# with 'mount -a' 'user' indicates that normal users are allowed to
mount \n" &
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
