Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r22 - in trunk: . .lang
|
From: <cod...@go...> - 2007-08-17 00:13:03
|
Author: easuter
Date: Thu Aug 16 13:16:38 2007
New Revision: 22
Modified:
trunk/.lang/.pot
trunk/.lang/Functions.pot
trunk/.lang/Global.pot
trunk/.lang/InputBox.pot
trunk/.lang/Main.pot
trunk/.lang/Utils.pot
trunk/.lang/cDiskInfo.pot
trunk/.lang/cPartInfo.pot
trunk/.lang/cPartInstall.pot
trunk/.lang/frmChoice.pot
trunk/.lang/frmConfig.pot
trunk/.lang/frmDriveSelect.pot
trunk/.lang/frmGO.pot
trunk/.lang/frmMain.pot
trunk/.lang/frmPackages.pot
trunk/.lang/frmPartSelect.pot
trunk/.lang/frmPartitioner.pot
trunk/.lang/frmPartitions.pot
trunk/.lang/frmTools.pot
trunk/.lang/frmWelcome.pot
trunk/Functions.module
trunk/Global.class
trunk/frmDriveSelect.class
Log:
Changes:
-Global module:
instDriveIndex long integer variable added to hold the index
corresponding to the installDrive string variable
-frmDriveSelect.class:
code added to assign the selected drive index in the
gridDisk_Click() event
-Functions:
AutoRootSize function now uses the hard-drive data stored in the
Global.DiskInfo array and no longer repeats the use of the fdisk
command
Modified: trunk/.lang/.pot
==============================================================================
--- trunk/.lang/.pot (original)
+++ trunk/.lang/.pot Thu Aug 16 13:16:38 2007
@@ -18,16 +18,16 @@
msgid "Enter a value:"
msgstr ""
-#: InputBox.class:205 frmDriveSelect.class:126 frmPartSelect.class:372
+#: InputBox.class:205 frmDriveSelect.class:129 frmPartSelect.class:372
msgid "OK"
msgstr ""
-#: InputBox.class:212 frmChooseFB.class:91 frmDriveSelect.class:133
+#: InputBox.class:212 frmChooseFB.class:91 frmDriveSelect.class:136
#: frmPartSelect.class:379
msgid "Cancel"
msgstr ""
-#: frmChoice.class:94
+#: frmChoice.class:95
msgid ""
"<center><h3><b>You have 3 choices:</b></h3></center>\n"
"\n"
@@ -48,23 +48,23 @@
"</ul>\n"
msgstr ""
-#: frmChoice.class:105
+#: frmChoice.class:106
msgid "Choose install type"
msgstr ""
-#: frmChoice.class:120
+#: frmChoice.class:121
msgid "Install types"
msgstr ""
-#: frmChoice.class:125
+#: frmChoice.class:126
msgid "Full-automatic"
msgstr ""
-#: frmChoice.class:131
+#: frmChoice.class:132
msgid "Semi-automatic"
msgstr ""
-#: frmChoice.class:137
+#: frmChoice.class:138
msgid "Advanced"
msgstr ""
@@ -206,11 +206,11 @@
msgid "Config 2"
msgstr ""
-#: frmDriveSelect.class:107 frmPartSelect.class:347
+#: frmDriveSelect.class:110 frmPartSelect.class:347
msgid "Drives"
msgstr ""
-#: frmDriveSelect.class:115
+#: frmDriveSelect.class:118
msgid "Click on a row to select..."
msgstr ""
Modified: trunk/.lang/Functions.pot
==============================================================================
--- trunk/.lang/Functions.pot (original)
+++ trunk/.lang/Functions.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/Functions.module
+# /home/easuter/vinstall-ng/Functions.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/Global.pot
==============================================================================
--- trunk/.lang/Global.pot (original)
+++ trunk/.lang/Global.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/Global.class
+# /home/easuter/vinstall-ng/Global.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/InputBox.pot
==============================================================================
--- trunk/.lang/InputBox.pot (original)
+++ trunk/.lang/InputBox.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/InputBox.class
+# /home/easuter/vinstall-ng/InputBox.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/Main.pot
==============================================================================
--- trunk/.lang/Main.pot (original)
+++ trunk/.lang/Main.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/Main.module
+# /home/easuter/vinstall-ng/Main.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/Utils.pot
==============================================================================
--- trunk/.lang/Utils.pot (original)
+++ trunk/.lang/Utils.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/Utils.module
+# /home/easuter/vinstall-ng/Utils.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/cDiskInfo.pot
==============================================================================
--- trunk/.lang/cDiskInfo.pot (original)
+++ trunk/.lang/cDiskInfo.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/cDiskInfo.class
+# /home/easuter/vinstall-ng/cDiskInfo.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/cPartInfo.pot
==============================================================================
--- trunk/.lang/cPartInfo.pot (original)
+++ trunk/.lang/cPartInfo.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/cPartInfo.class
+# /home/easuter/vinstall-ng/cPartInfo.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/cPartInstall.pot
==============================================================================
--- trunk/.lang/cPartInstall.pot (original)
+++ trunk/.lang/cPartInstall.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/cPartInstall.class
+# /home/easuter/vinstall-ng/cPartInstall.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/frmChoice.pot
==============================================================================
--- trunk/.lang/frmChoice.pot (original)
+++ trunk/.lang/frmChoice.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmChoice.class
+# /home/easuter/vinstall-ng/frmChoice.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"
-#: frmChoice.class:94
+#: frmChoice.class:95
msgid "<center><h3><b>You have 3 choices:</b></h3></center>\n\n<ul>\n<li><b><u>Full-automatic install:</u></b> Our easiest install yet; choose this option if you want to use your entire hard disk for VL. Your system will be automatically set up, partitions and all. <font color=\"#FF0000\">WARNING: this option will DELETE everything on your hard disk, or offer a choice if there are multiple disks.</font> There will of course be a confirmation dialog in case you selected this option by mistake.</li>\n<li><b><u>Semi-automatic install:</u></b> With this option, you manually partition your drives with gparted, but the rest of the setup will be pretty automatic.</li>\n<li><b><u>Advanced install:</u></b> For the technically savvy user that must do everything by hand. You can control most aspects of the install. However, there will be assisted options available all the way through, so this is a very flexible install.</li>\n</ul>\n"
msgstr ""
-#: frmChoice.class:105
+#: frmChoice.class:106
msgid "Choose install type"
msgstr ""
-#: frmChoice.class:120
+#: frmChoice.class:121
msgid "Install types"
msgstr ""
-#: frmChoice.class:125
+#: frmChoice.class:126
msgid "Full-automatic"
msgstr ""
-#: frmChoice.class:131
+#: frmChoice.class:132
msgid "Semi-automatic"
msgstr ""
-#: frmChoice.class:137
+#: frmChoice.class:138
msgid "Advanced"
msgstr ""
Modified: trunk/.lang/frmConfig.pot
==============================================================================
--- trunk/.lang/frmConfig.pot (original)
+++ trunk/.lang/frmConfig.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmConfig.class
+# /home/easuter/vinstall-ng/frmConfig.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/frmDriveSelect.pot
==============================================================================
--- trunk/.lang/frmDriveSelect.pot (original)
+++ trunk/.lang/frmDriveSelect.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmDriveSelect.class
+# /home/easuter/vinstall-ng/frmDriveSelect.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: frmDriveSelect.class:107
+#: frmDriveSelect.class:110
msgid "Drives"
msgstr ""
-#: frmDriveSelect.class:115
+#: frmDriveSelect.class:118
msgid "Click on a row to select..."
msgstr ""
-#: frmDriveSelect.class:126
+#: frmDriveSelect.class:129
msgid "OK"
msgstr ""
-#: frmDriveSelect.class:133
+#: frmDriveSelect.class:136
msgid "Cancel"
msgstr ""
Modified: trunk/.lang/frmGO.pot
==============================================================================
--- trunk/.lang/frmGO.pot (original)
+++ trunk/.lang/frmGO.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmGO.class
+# /home/easuter/vinstall-ng/frmGO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/frmMain.pot
==============================================================================
--- trunk/.lang/frmMain.pot (original)
+++ trunk/.lang/frmMain.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmMain.class
+# /home/easuter/vinstall-ng/frmMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/frmPackages.pot
==============================================================================
--- trunk/.lang/frmPackages.pot (original)
+++ trunk/.lang/frmPackages.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmPackages.class
+# /home/easuter/vinstall-ng/frmPackages.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/frmPartSelect.pot
==============================================================================
--- trunk/.lang/frmPartSelect.pot (original)
+++ trunk/.lang/frmPartSelect.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmPartSelect.class
+# /home/easuter/vinstall-ng/frmPartSelect.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/frmPartitioner.pot
==============================================================================
--- trunk/.lang/frmPartitioner.pot (original)
+++ trunk/.lang/frmPartitioner.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmPartitioner.class
+# /home/easuter/vinstall-ng/frmPartitioner.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/frmPartitions.pot
==============================================================================
--- trunk/.lang/frmPartitions.pot (original)
+++ trunk/.lang/frmPartitions.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmPartitions.class
+# /home/easuter/vinstall-ng/frmPartitions.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/frmTools.pot
==============================================================================
--- trunk/.lang/frmTools.pot (original)
+++ trunk/.lang/frmTools.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmTools.class
+# /home/easuter/vinstall-ng/frmTools.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/.lang/frmWelcome.pot
==============================================================================
--- trunk/.lang/frmWelcome.pot (original)
+++ trunk/.lang/frmWelcome.pot Thu Aug 16 13:16:38 2007
@@ -1,4 +1,4 @@
-# /home/moe/projects/vl-installer/frmWelcome.class
+# /home/easuter/vinstall-ng/frmWelcome.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: trunk/Functions.module
==============================================================================
--- trunk/Functions.module (original)
+++ trunk/Functions.module Thu Aug 16 13:16:38 2007
@@ -277,24 +277,13 @@
DIM iTotalSize AS Long
DIM sTemp AS String
-IF Global.enumPARTMODE = 0 THEN 'Use entire drive
- IF Global.SimulationMode = TRUE THEN
- sTemp = "3800000"
- ELSE 'Get real value from fdisk
- SHELL "fdisk -s " & Global.installDrive TO sTemp
- ENDIF
-
- iTotalSize = CLng(Val(Trim$(sTemp))) * 1024 'Convert to long integer and turn value into bytes
+IF partmode = 0 THEN 'Use entire drive
+ iTotalSize = Global.DiskInfo[Global.instDriveIndex - 1].Bytes
iRootSize = iTotalSize - CalcSwap(Global.SysMemory)
-
-ELSE IF Global.enumPARTMODE = 1 'Use only free space
- IF Global.SimulationMode = TRUE THEN
- sTemp = "3800000"
- ELSE
- 'Do whatever needs to be done to get free space values from available partitions
- ENDIF
+ELSE IF partmode = 1 'Use only free space on partition
+ 'Do whatever needs to be done to get free space values from available partitions
ELSE
- Message.Error("Unacceptable partition mode (" & Global.enumPARTMODE & ") for AutoRootSize function.")
+ Message.Error("Unacceptable partition mode (" & partmode & ") for AutoRootSize function.")
ENDIF
RETURN iRootSize
Modified: trunk/Global.class
==============================================================================
--- trunk/Global.class (original)
+++ trunk/Global.class Thu Aug 16 13:16:38 2007
@@ -64,6 +64,7 @@
'temp stuff 2 check out:
STATIC PUBLIC installDrive AS String
+STATIC PUBLIC instDriveIndex AS Long
' Boot Manager variables
STATIC PUBLIC MBRSel AS String ' MBR to use in case there is more than 1
Modified: trunk/frmDriveSelect.class
==============================================================================
--- trunk/frmDriveSelect.class (original)
+++ trunk/frmDriveSelect.class Thu Aug 16 13:16:38 2007
@@ -4,6 +4,7 @@
PRIVATE MaxDisks AS Long
PRIVATE selectedDisk AS String
+PRIVATE selectedDiskIndex AS Long
PUBLIC SUB Form_Open()
DIM arrTemp AS NEW String[]
@@ -64,6 +65,7 @@
NEXT
gridDisk[gridDisk.Row, 3].Text = "+++"
selectedDisk = gridDisk[gridDisk.Row, 0].Text
+ selectedDiskIndex = gridDisk.Row
ENDIF
END
@@ -72,6 +74,7 @@
IF selectedDisk = "" THEN selectedDisk = gridDisk[1, 0].Text
Global.installDrive = selectedDisk
+Global.instDriveIndex = selectedDiskIndex
IF Global.DebugMode = TRUE THEN message.Info(Global.installDrive)
ME.Close(TRUE)
|
