Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r228 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-10-14 19:48:07
|
Author: M0...@gm...
Date: Tue Oct 14 12:46:32 2008
New Revision: 228
Added:
branches/iVL/FrmCredits.class
branches/iVL/FrmCredits.form
Removed:
branches/iVL/FrmEmbUsrAdd.class
branches/iVL/FrmEmbUsrAdd.form
branches/iVL/FrmLicense.class
branches/iVL/FrmLicense.form
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/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/FrmPkgsel2.form
branches/iVL/FrmZoneSet.form
branches/iVL/MdlCore.module
branches/iVL/MdlPkgSel.module
branches/iVL/MdlSetup.module
branches/iVL/MdlSummarize.module
Log:
- Cleaned up redundant unnecessary code in MdlCore
- Cleaned up unnecessary code from the package selection click() event
- Tuned the package selection description label
- Added vertically scrolling credits during installation process ;)
* (Bug @ Lost&LovingLinux) ** Maybe gb.gtk bug?
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/.project
+# /home/moe/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsGlobal.class
+# /home/moe/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsPartSel.class
+# /home/moe/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/ClsWinDrives.class
+# /home/moe/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FMain.class
+# /home/moe/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmDiskPart.class
+# /home/moe/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartScheme.class
+# /home/moe/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartSel.class
+# /home/moe/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPkgSel.class
+# /home/moe/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSelISO.class
+# /home/moe/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSummary.class
+# /home/moe/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmWinDrives.class
+# /home/moe/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlCore.module
+# /home/moe/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,99 +14,99 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlCore.module:235
+#: MdlCore.module:182
msgid "Scanning system for installable media. Please wait ..."
msgstr ""
-#: MdlCore.module:251
+#: MdlCore.module:198
msgid "No Installable Media Found"
msgstr ""
-#: MdlCore.module:253
+#: MdlCore.module:200
msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
msgstr ""
-#: MdlCore.module:253
+#: MdlCore.module:200
msgid "installation CD and click "
msgstr ""
-#: MdlCore.module:253
+#: MdlCore.module:200
msgid "to try again"
msgstr ""
-#: MdlCore.module:414
+#: MdlCore.module:361
msgid "Build Date: "
msgstr ""
-#: MdlCore.module:414
+#: MdlCore.module:361
msgid "MINIMUM REQUIREMENTS"
msgstr ""
-#: MdlCore.module:419
+#: MdlCore.module:366
msgid "Setup is unable to find SETUP.CONF in your install media. This
could be symptoms of a bad burn or a bad ISO"
msgstr ""
-#: MdlCore.module:492
+#: MdlCore.module:439
msgid "Cannot find SETUP.CONF"
msgstr ""
-#: MdlCore.module:500
+#: MdlCore.module:447
msgid "Preparation"
msgstr ""
-#: MdlCore.module:501
+#: MdlCore.module:448
msgid "Language Selection"
msgstr ""
-#: MdlCore.module:502
+#: MdlCore.module:449
msgid "Find installation media"
msgstr ""
-#: MdlCore.module:503
+#: MdlCore.module:450
msgid "Disk Partitioning"
msgstr ""
-#: MdlCore.module:504
+#: MdlCore.module:451
msgid "Software Selection"
msgstr ""
-#: MdlCore.module:506
+#: MdlCore.module:453
msgid "Installation"
msgstr ""
-#: MdlCore.module:507
+#: MdlCore.module:454
msgid "Installation Summary"
msgstr ""
-#: MdlCore.module:509
+#: MdlCore.module:456
msgid "Install Operating System"
msgstr ""
-#: MdlCore.module:510
+#: MdlCore.module:457
msgid "System Configuration"
msgstr ""
-#: MdlCore.module:511
+#: MdlCore.module:458
msgid "Boot Menu Options"
msgstr ""
-#: MdlCore.module:512
+#: MdlCore.module:459
msgid "Regional Settings"
msgstr ""
-#: MdlCore.module:513
+#: MdlCore.module:460
msgid "System Administrator"
msgstr ""
-#: MdlCore.module:514
+#: MdlCore.module:461
msgid "User Accounts"
msgstr ""
-#: MdlCore.module:515
+#: MdlCore.module:462
msgid "Network Configuration"
msgstr ""
-#: MdlCore.module:516
+#: MdlCore.module:463
msgid "Hardware Configuration"
msgstr ""
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlDiskPart.module
+# /home/moe/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlObjSizer.module
+# /home/moe/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlPartSel.module
+# /home/moe/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlPkgSel.module
+# /home/moe/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlSetup.module
+# /home/moe/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,11 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:247
+#: MdlSetup.module:227
+msgid "BROUGHT TO YOU BY"
+msgstr ""
+
+#: MdlSetup.module:243
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:249
+#: MdlSetup.module:245
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlSummarize.module
+# /home/moe/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -22,23 +22,23 @@
msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
msgstr ""
-#: MdlSummarize.module:55
+#: MdlSummarize.module:56
msgid "INSTALL TYPE:"
msgstr ""
-#: MdlSummarize.module:55
+#: MdlSummarize.module:56
msgid "Custom"
msgstr ""
-#: MdlSummarize.module:57
+#: MdlSummarize.module:58
msgid "BULK PACKAGES:"
msgstr ""
-#: MdlSummarize.module:61
+#: MdlSummarize.module:62
msgid "OPTIONAL PACKAGES:"
msgstr ""
-#: MdlSummarize.module:67
+#: MdlSummarize.module:69
msgid "Full"
msgstr ""
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Tue Oct 14 12:46:32 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlWinDrives.module
+# /home/moe/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Tue Oct 14 12:46:32 2008
@@ -0,0 +1,7 @@
+- Cleaned up redundant unnecessary code in MdlCore
+- Cleaned up unnecessary code from the package selection click() event
+- Tuned the package selection description label
+- Added vertically scrolling credits during installation process ;)
+ * (Bug @ Lost&LovingLinux) ** Maybe gb.gtk bug?
+
+
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Oct 14 12:46:32 2008
@@ -36,7 +36,7 @@
-ME.Maximized = TRUE
+'ME.Maximized = TRUE
frmInit = MdlCore.frmInit
'MdlCore.LOCK_GUI
'frmInit = FrmLangSel
@@ -70,8 +70,8 @@
.tvPlan.BackColor = Color.transparent
.tlBanner.Height = .PictureBox1.Height
'.tvPlan.Width = MdlCore.iLeftWidth
- ' .Width = 800
- ' .Height = 600
+ .Width = 800
+ .Height = 600
END WITH
Added: branches/iVL/FrmCredits.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmCredits.class Tue Oct 14 12:46:32 2008
@@ -0,0 +1,46 @@
+' Gambas class file
+
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+
+PUBLIC SUB Timer1_Timer()
+
+ INC ScrollView1.ScrollY
+ 'PRINT ScrollView1.scrolly & " |" & ScrollView1.ScrollH & " | " &
ScrollView1.Height
+ IF ScrollView1.ScrollY = ScrollView1.scrollh - ScrollView1.Height THEN
ScrollView1.Scroll(0, 0)
+
+
+END
+
+PUBLIC SUB Form_Open()
+ ME.TextLabel1.Adjust
+ ME.TextLabel1.Height = ME.ScrollView1.Height * 15
+ ME.Timer1.Enabled = TRUE
+
+END
+
+
+
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .PictureBox1.Move(.ClientWidth / 2 - (.PictureBox1.Width / 2), 4)
+ .ScrollView1.Move(.ClientWidth / 2 - (.ScrollView1.Width /
2), .PictureBox1.top + .PictureBox1.Height + 8)
+ .ScrollView1.Height = .ClientH - .ScrollView1.top - 12
+ END WITH
+END
Added: branches/iVL/FrmCredits.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmCredits.form Tue Oct 14 12:46:32 2008
@@ -0,0 +1,26 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,56,36)
+ Text = ("")
+ { ScrollView1 ScrollView
+ MoveScaled(3,8,50,26)
+ Border = False
+ ScrollBar = Scroll.None
+ { TextLabel1 TextLabel
+ MoveScaled(2,7,43,113)
+ Text = ("")
+ Alignment = Align.Center
+ }
+ }
+ { Timer1 #Timer
+ #X = 376
+ #Y = 8
+ Delay = 50
+ }
+ { PictureBox1 PictureBox
+ MoveScaled(5,2,41,6)
+ Picture = Picture["images/installer.png"]
+ Stretch = True
+ }
+}
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Tue Oct 14 12:46:32 2008
@@ -20,12 +20,18 @@
PUBLIC SUB BEGIN_PROCESS()
DIM sRes AS Integer ' we will need to
+ DIM sCredits AS String = DConv(File.Load(ClsGlobal.sSourceMnt
&/ "CREDIT"))
MdlCore.lock_gui()
FMain.FrmCurr = ME
FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
FMain.tvPlan["Inst1"].Selected = TRUE
+ Message(sCredits)
+ ' LOAD CREDITS INTO THE TEXTLABEL
+ FrmCredits.TextLabel1.text = "<b>" & "BROUGHT TO YOU BY"
& "</b><br><br><br>" &
+ sCredits
+ RETURN
MdlInstallSys.ACTIVATE_SWAP_SPACE() ' activate swap for the current install
@@ -60,7 +66,11 @@
PRINT "Begin installation process"
' ' ' MdlSetup.BEGIN_INSTALLATION()
+' run external credits here
+ FrmCredits.Reparent(ME.embCredits)
+ FrmCredits.Show
+
END
@@ -135,6 +145,8 @@
.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)
+ .embCredits.Move(.ClientWidth / 2 - (.embCredits.Width /
2), .pbInstallProg2.top + .pbInstallProg2.Height + 8)
+ .embCredits.Height = .ClientH - .embCredits.top - 16
END WITH
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Tue Oct 14 12:46:32 2008
@@ -29,4 +29,7 @@
MoveScaled(3,26,11,3)
Text = ("Current Step ")
}
+ { embCredits Panel
+ MoveScaled(12,40,52,32)
+ }
}
Modified: branches/iVL/FrmPkgsel2.form
==============================================================================
--- branches/iVL/FrmPkgsel2.form (original)
+++ branches/iVL/FrmPkgsel2.form Tue Oct 14 12:46:32 2008
@@ -19,7 +19,7 @@
MoveScaled(1,2,56,13)
Background = Color.LightBackground
Text = ("")
- Alignment = Align.Left
+ Alignment = Align.Normal
Transparent = True
}
}
Modified: branches/iVL/FrmZoneSet.form
==============================================================================
--- branches/iVL/FrmZoneSet.form (original)
+++ branches/iVL/FrmZoneSet.form Tue Oct 14 12:46:32 2008
@@ -11,7 +11,7 @@
Text = ("Choose the correct timezone for the area in which you live.")
}
{ cbHwClock ComboBox
- MoveScaled(1,15,34,3.3333)
+ MoveScaled(1,15,34,3.25)
Text = ("ComboBox1")
ReadOnly = True
List = [("LocalTime"), ("UTC")]
@@ -21,7 +21,7 @@
Text = ("Choose how\nyour hardware clock is set up.\nChoose UTC if you
know that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way.")
}
{ tlbanner TextLabel
- MoveScaled(2,1,27,3.3333)
+ MoveScaled(2,1,27,3.25)
Text = ("")
}
{ hrsep Separator
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Tue Oct 14 12:46:32 2008
@@ -17,9 +17,6 @@
-
-
-'PUBLIC sCatPic AS picture = Picture["icon:/16/linux"]
PUBLIC sCatPic AS Picture = Picture["images/category.png"]
PUBLIC sToDopic AS Picture = Picture["images/circle.png"]
PUBLIC sNowPic AS picture = Picture["images/arrow.png"]
@@ -39,53 +36,30 @@
SHELL "ls " & ClsGlobal.sSourceMnt & " | grep -i vl* | grep -i iso" TO
sResults
sResults = Trim(sResults)
'Message(sResults)
- IF sResults <> "" THEN
- IF InStr(sResults, gb.NewLine) THEN 'more than one iso was
found... do a loop for each one
+ 'IF sResults <> "" THEN
+ ' IF InStr(sResults, gb.NewLine) THEN 'more than one iso was
found... do a loop for each one
' this loop will mount each iso and store it's SETUP.CONF to
a temp file
sISOList = Split(sResults, gb.NewLine)
FOR i = 0 TO sISOList.count - 1
sIso = Trim(sISOList[i])
- SHELL "umount /mnt/loop" WAIT
+
IF Exist("/mnt/loop") = FALSE THEN
MKDIR "/mnt/loop"
END IF
+ SHELL "umount /mnt/loop" WAIT
SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/ sISO
& Space(1) & "/mnt/loop" WAIT
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
+ 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
-
-
-
- ELSE ' only one iso found
- IF IsDir("/mnt/loop") = FALSE THEN
- TRY MKDIR "/mnt/loop"
- END IF
- SHELL "umount /mnt/loop" WAIT 'clear the mount point
- SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/ sResults &
Space(1) & " /mnt/loop" WAIT
- File.Save(Temp(sResults),
File.Load("/mnt/loop/veclinux/SETUP.CONF"))
- 'Message(File.Load(Temp(sResults)))
- SHELL "umount /mnt/loop && umount " & ClsGlobal.sSourceMnt
WAIT
- IF FrmSelISO.lstInstallableImg.Find(sResults & " on " &
sDrive) = -1 THEN
- FrmSelISO.lstInstallableImg.Add(sResults & " on " &
sDrive)
- END IF
- END IF
-
- ELSE 'no ISO's found
- SHELL "umount " & ClsGlobal.sSourceMnt
-
- END IF
-
+
END
@@ -99,8 +73,7 @@
DIM i AS Integer
DIM sPartition AS String
-'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \' \'" TO
sResults
- 'SHELL "/sbin/probepart |grep -i extended | grep -i swap | cut -f 1 -d
\' \' | grep /dev" TO sResults
+
SHELL "probepart | grep -v -i \'swap\' | grep -v -i \'ext\' |grep
\'/dev\'| grep -v \'Disk\'| cut -f 1 -d \' \'" TO sResults
'Message(sResults)
sResults = Trim(sResults)
@@ -137,7 +110,8 @@
SHELL sCmd TO sList
sList = Trim(sList)
'PRINT sList
- IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
+ IF Len(sList) < 1 THEN RETURN
+ 'IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
sDrives = Split(sList, Space(1))
FOR i = 0 TO sDrives.count - 1
@@ -162,35 +136,8 @@
END IF
SHELL "umount " & sMountPoint WAIT
- 'SHELL "umount /dev/" & sDrive WAIT
- 'SHELL "umount " & sDrive WAIT
+
NEXT
-
- ELSE ' only one drive found
- sDrive = Trim(sList)
- SHELL "mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
- IF Exist(sMountPoint &/ "veclinux" &/ "SETUP.CONF") = TRUE THEN
- sDump = ME.ID_DISTRO(sMountPoint &/ "veclinux"
&/ "SETUP.CONF")
- 'save a copy of SETUP.CONF in a temp disposable file
- ' this temp file will be named as the last characters of
the drive that contains the distro (ie, hda, sg0, sda)
- ' this information will be used FOR reading the file
later
-
- File.Save(Temp$(sDrive), DConv(File.Load(sMountPoint
&/ "veclinux" &/ "SETUP.CONF")))
- 'Message.Info(File.Load(Temp$(sDrive)))
-
- IF FrmSelISO.lstInstallableImg.Find(sDump & " on "
& "/dev/" & sDrive) = -1 THEN 'only add the entry if not found
- FrmSelISO.lstInstallableImg.Add(sDump & " on " & "/dev/" &
sDrive)
- END IF
-
-
- END IF
- 'SHELL "umount /dev/" & clsglobal.sSourceMnt WAIT
- SHELL "umount " & ClsGlobal.sSourceMnt WAIT
-
-
- END IF
-
-
MdlCore.unlock_gui()
fmain.btback.Enabled = FALSE
Modified: branches/iVL/MdlPkgSel.module
==============================================================================
--- branches/iVL/MdlPkgSel.module (original)
+++ branches/iVL/MdlPkgSel.module Tue Oct 14 12:46:32 2008
@@ -111,21 +111,21 @@
END
-PUBLIC SUB Packages_click()
-
-
-
- IF ClsPkgSel.arrPkgs THEN
- ClsPkgSel.arrPkgs.Clear
- END IF
- ME.GET_USER_PKG_SELECTION()
-
- ' Now display a description here
-
-
- 'PRINT sDump
-
-END
+' ' ' PUBLIC SUB Packages_click()
+' ' '
+' ' '
+' ' '
+' ' ' IF ClsPkgSel.arrPkgs THEN
+' ' ' ClsPkgSel.arrPkgs.Clear
+' ' ' END IF
+' ' ' ME.GET_USER_PKG_SELECTION()
+' ' '
+' ' ' ' Now display a description here
+' ' '
+' ' '
+' ' ' 'PRINT sDump
+' ' '
+' ' ' END
PUBLIC SUB Packages_enter()
@@ -135,8 +135,6 @@
DIM i AS Integer
DIM sDesc AS String
-
-
sSearch = Right(LAST.tag, Len(LAST.tag) - InStr(LAST.tag, "/"))
'Message(sSearch)
@@ -152,8 +150,12 @@
NEXT
sDesc = Trim(sDesc)
-
- FrmPkgsel2.tlPkgDesc.Text = sDesc
+ WITH FrmPkgsel2.tlPkgDesc
+ .Move(4, 4, .Parent.Width - (.left * 2), .Parent.Height - (.top * 2))
+ .text = Trim(sDesc)
+ .Alignment = Align.Normal
+ 'FrmPkgsel2.tlPkgDesc.Text = sDesc
+ END WITH
END
@@ -162,18 +164,18 @@
-PUBLIC SUB OptBulks_click()
-
- IF ClsPkgSel.arrBulks THEN
- ClsPkgSel.arrBulks.Clear
- END IF
- ME.GET_USER_BULK_SELECTION
-
- PRINT LAST.tag
-
-END
-
-
+' PUBLIC SUB OptBulks_click()
+'
+' IF ClsPkgSel.arrBulks THEN
+' ClsPkgSel.arrBulks.Clear
+' END IF
+' ME.GET_USER_BULK_SELECTION
+'
+' PRINT LAST.tag
+'
+' END
+' '
+' '
PUBLIC SUB GET_USER_BULK_SELECTION()
DIM cb AS CheckBox
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Tue Oct 14 12:46:32 2008
@@ -170,28 +170,7 @@
' let's get a package count
IF bCustom = FALSE THEN ' DOING A FULL INSTALL
- ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sDump
- ' sDump = Trim(sDump)
- ' sTotalList = sTotalList & sDump
- ' sTotalList = Trim(sTotalList)
- ' sDump = ""
- ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^CONF" TO sDump
- ' sTotalList = sTotalList & gb.NewLine & Trim(sDump)
- ' sDump = ""
- ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT
| grep ^\"PACKAGE NAME\"" TO sDump
- ' sTotalList = sTotalList & gb.NewLine & Trim(sDump)
- ' sDump = ""
- ' SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sDump
- ' sTotalList = sTotalList & gb.NewLine & Trim(sDump)
- ' sDump = ""
- ' ' split the array
- ' sList = Split(sTotalList, "\n")
- ' FOR i = 0 TO sList.Count - 1
- ' IF sList[i] = "" THEN
- ' sList.Delete(i)
- ' END IF
- ' NEXT
- ' iQTY = sList.Count
+
SHELL "find " & ClsGlobal.sSourceMnt & " -name \"*.tlz\"|wc -l" TO
iQTY
ELSE ' GOING FOR CUSTOM INSTALL
@@ -241,14 +220,31 @@
END
PUBLIC SUB BEGIN_INSTALLATION()
+ DIM sCreditList AS String = File.Load(ClsGlobal.sSourceMnt &/ "CREDIT")
+ DIM sCredit AS String[] = Split(sCreditList, "\n")
+ DIM i AS Integer
+ FrmCredits.TextLabel1.text = "<b>" & ("BROUGHT TO YOU BY")
& "</b><br><br><br><br><br>" '& sCreditList
+ FOR i = 0 TO sCredit.count - 1
+ IF InStr(sCredit[i], "M0E-lnx") THEN
+ sCredit[i] = "<b>" & "M0E-lnx" & "</b><br>" & "[ GUI
Installer, vpackager, VASMCC ]"
+ ELSE IF InStr(sCredit[i], "Uelsk8s") THEN
+ sCredit[i] = "<b>" & "Uelsk8s" & "</b><br>" & "[ GUI
Installer, ISO Master, vlthemeswitch ]"
+ ELSE IF Left(sCredit[i], Len("Lost")) = "Lost" THEN
+ sCredit[i] = "Lost-n-LovinLinux" ' " Lost " & " & " & "
LovinLinux ""
+ END IF
+ FrmCredits.TextLabel1.text = FrmCredits.TextLabel1.text &
sCredit[i] & "<br><br><br>"
+ NEXT
+
+
+
MdlCore.LOCK_GUI()
FrmInstallSys.tlCurrPkg.text = ("Activating swap space")
MdlInstallSys.ACTIVATE_SWAP_SPACE()
FrmInstallSys.tlCurrPkg.text = ("Preparing filesystems")
MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' This will start the install
process
-
+
END
Modified: branches/iVL/MdlSummarize.module
==============================================================================
--- branches/iVL/MdlSummarize.module (original)
+++ branches/iVL/MdlSummarize.module Tue Oct 14 12:46:32 2008
@@ -52,6 +52,7 @@
END IF
IF ClsPkgSel.bCustom = TRUE THEN
+ FrmSummary.tlSummary.Height = FrmSummary.scrSumm.Height * 1.5
sText = sText & "<b>" & ("INSTALL TYPE:") & "</b>" & Space(1) &
("Custom") & "<br>"
sText = sText & "<br><b>" & ("BULK PACKAGES:") & "</b> "
@@ -64,7 +65,9 @@
NEXT
ELSE
+ FrmSummary.tlSummary.Height = FrmSummary.scrSumm.Height * 0.75
sText = sText & "<b>" & ("INSTALL TYPE:") & "</b>" & Space(1) &
("Full") & "<br>"
+
END IF
|
