Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r486 - in branches/speedy: . .lang
|
From: <cod...@go...> - 2009-02-06 23:12:35
|
Author: M0...@gm...
Date: Fri Feb 6 14:00:07 2009
New Revision: 486
Added:
branches/speedy/.lang/ClsFstab.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/Step4.pot
branches/speedy/ClsFstab.class
branches/speedy/Step3a.class
branches/speedy/Step3a.form
branches/speedy/Step3a1.class
branches/speedy/Step3a1.form
branches/speedy/Step3a2.class
branches/speedy/Step3a2.form
branches/speedy/Step4.class
branches/speedy/Step4.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.project
branches/speedy/FMain.class
branches/speedy/FMain.form
branches/speedy/FMain0.form
branches/speedy/MdlStartUp.module
branches/speedy/Step1.class
branches/speedy/Step1.form
branches/speedy/Step2.class
branches/speedy/Step3.class
branches/speedy/Step3.form
branches/speedy/Step5.class
branches/speedy/Step6.class
Log:
Began working on autopartition scheme
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Feb 6 14:00:07 2009
@@ -14,19 +14,19 @@
msgid "VectorLinux Installer"
msgstr ""
-#: FMain.class:242 FMain0.class:232
+#: FMain.class:245 FMain0.class:233
msgid "Process Overview"
msgstr ""
-#: FMain.class:284 FMain0.class:270
+#: FMain.class:287 FMain0.class:271
msgid "Back"
msgstr ""
-#: FMain.class:295 FMain0.class:281
+#: FMain.class:298 FMain0.class:282
msgid "Next"
msgstr ""
-#: FMain.class:306 FMain0.class:292
+#: FMain.class:309 FMain0.class:293
msgid "Quit"
msgstr ""
@@ -62,67 +62,67 @@
msgid "on"
msgstr ""
-#: Step1.class:133
+#: Step1.class:130
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:152
+#: Step1.class:149
msgid "Found"
msgstr ""
-#: Step1.class:152
+#: Step1.class:149
msgid "in partition"
msgstr ""
-#: Step1.class:193
+#: Step1.class:190
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:206
+#: Step1.class:203
msgid "Scanning"
msgstr ""
-#: Step1.class:216
+#: Step1.class:213
msgid "in"
msgstr ""
-#: Step1.class:244
+#: Step1.class:241
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:337
+#: Step1.class:334
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:340
+#: Step1.class:337
msgid "VERSION"
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "WARNING:"
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:469
+#: Step1.class:466
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:487
+#: Step1.class:484
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:508
+#: Step1.class:505
msgid "Search Again"
msgstr ""
-#: Step1.class:532
+#: Step1.class:529
msgid "Check Installation media before installing"
msgstr ""
@@ -242,36 +242,88 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:129
+#: Step3.class:132 Step3a.class:102
msgid "TextLabel1"
msgstr ""
-#: Step3.class:147
+#: Step3.class:150
msgid "Automatic"
msgstr ""
-#: Step3.class:157
+#: Step3.class:160
msgid ""
"Automatically resize your partitions to make size for your VectorLinux "
"installation"
msgstr ""
-#: Step3.class:164
+#: Step3.class:167
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:174
+#: Step3.class:177
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:181
+#: Step3.class:184
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:191
+#: Step3.class:194
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr ""
+
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr ""
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr ""
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+
+#: Step3a.class:24
+msgid "Locate free space on hard disk and install VectorLinux there."
+msgstr ""
+
+#: Step3a.class:24
+msgid "This option will not erase any data off your hard drive"
+msgstr ""
+
+#: Step3a.class:113
+msgid "Use Free space on my hard disk"
+msgstr ""
+
+#: Step3a.class:134
+msgid "Use entire disk"
+msgstr ""
+
+#: Step3a1.class:19
+msgid "Use Entire Hard Disk"
+msgstr ""
+
+#: Step3a2.class:22
+msgid "Install VectorLinux to free space on disk"
+msgstr ""
+
+#: Step3a2.class:49
+msgid "No hard disks found on your system. Please select"
+msgstr ""
+
+#: Step3a2.class:49
+msgid "Another partitioning option"
+msgstr ""
+
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr ""
+
#: Step5.class:19
msgid "Resize partitions using Gparted"
msgstr ""
@@ -368,54 +420,54 @@
msgid "Restart Now"
msgstr ""
-#: Step6.class:46
+#: Step6.class:58
msgid "Partition"
msgstr ""
-#: Step6.class:47
+#: Step6.class:59
msgid "Size"
msgstr ""
-#: Step6.class:48
+#: Step6.class:60
msgid "Mount Point"
msgstr ""
-#: Step6.class:49
+#: Step6.class:61
msgid "File System"
msgstr ""
-#: Step6.class:106
+#: Step6.class:133
msgid "Not Used"
msgstr ""
-#: Step6.class:118
+#: Step6.class:154
msgid "Do not format"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "You have already selected"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "as your"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "partition."
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:214
+#: Step6.class:280
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:350
+#: Step6.class:385
msgid "Yes"
msgstr ""
-#: Step6.class:350
+#: Step6.class:385
msgid "No"
msgstr ""
Added: branches/speedy/.lang/ClsFstab.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/ClsFstab.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,16 @@
+# /home/vluser/devel/speedy/ClsFstab.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Fri Feb 6 14:00:07 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:242
+#: FMain.class:245
msgid "Process Overview"
msgstr ""
-#: FMain.class:284
+#: FMain.class:287
msgid "Back"
msgstr ""
-#: FMain.class:295
+#: FMain.class:298
msgid "Next"
msgstr ""
-#: FMain.class:306
+#: FMain.class:309
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Fri Feb 6 14:00:07 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:232
+#: FMain0.class:233
msgid "Process Overview"
msgstr ""
-#: FMain0.class:270
+#: FMain0.class:271
msgid "Back"
msgstr ""
-#: FMain0.class:281
+#: FMain0.class:282
msgid "Next"
msgstr ""
-#: FMain0.class:292
+#: FMain0.class:293
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Fri Feb 6 14:00:07 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:133
+#: Step1.class:130
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:152
+#: Step1.class:149
msgid "Found"
msgstr ""
-#: Step1.class:152
+#: Step1.class:149
msgid "in partition"
msgstr ""
-#: Step1.class:193
+#: Step1.class:190
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:206
+#: Step1.class:203
msgid "Scanning"
msgstr ""
-#: Step1.class:216
+#: Step1.class:213
msgid "in"
msgstr ""
-#: Step1.class:244
+#: Step1.class:241
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:337
+#: Step1.class:334
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:340
+#: Step1.class:337
msgid "VERSION"
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "WARNING:"
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:469
+#: Step1.class:466
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:487
+#: Step1.class:484
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:508
+#: Step1.class:505
msgid "Search Again"
msgstr ""
-#: Step1.class:532
+#: Step1.class:529
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Fri Feb 6 14:00:07 2009
@@ -22,31 +22,31 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:129
+#: Step3.class:132
msgid "TextLabel1"
msgstr ""
-#: Step3.class:147
+#: Step3.class:150
msgid "Automatic"
msgstr ""
-#: Step3.class:157
+#: Step3.class:160
msgid "Automatically resize your partitions to make size for your
VectorLinux installation"
msgstr ""
-#: Step3.class:164
+#: Step3.class:167
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:174
+#: Step3.class:177
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:181
+#: Step3.class:184
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:191
+#: Step3.class:194
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
Added: branches/speedy/.lang/Step3a.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,52 @@
+# /home/vluser/devel/speedy/Step3a.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr ""
+
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr ""
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr ""
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+
+#: Step3a.class:24
+msgid "Locate free space on hard disk and install VectorLinux there."
+msgstr ""
+
+#: Step3a.class:24
+msgid "This option will not erase any data off your hard drive"
+msgstr ""
+
+#: Step3a.class:102
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3a.class:113
+msgid "Use Free space on my hard disk"
+msgstr ""
+
+#: Step3a.class:134
+msgid "Use entire disk"
+msgstr ""
+
Added: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a1.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,20 @@
+# /home/vluser/devel/speedy/Step3a1.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Step3a1.class:19
+msgid "Use Entire Hard Disk"
+msgstr ""
+
Added: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a2.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,28 @@
+# /home/vluser/devel/speedy/Step3a2.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Step3a2.class:22
+msgid "Install VectorLinux to free space on disk"
+msgstr ""
+
+#: Step3a2.class:49
+msgid "No hard disks found on your system. Please select"
+msgstr ""
+
+#: Step3a2.class:49
+msgid "Another partitioning option"
+msgstr ""
+
Added: branches/speedy/.lang/Step4.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step4.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,20 @@
+# /home/vluser/devel/speedy/Step4.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr ""
+
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Fri Feb 6 14:00:07 2009
@@ -14,55 +14,55 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step6.class:46
+#: Step6.class:58
msgid "Partition"
msgstr ""
-#: Step6.class:47
+#: Step6.class:59
msgid "Size"
msgstr ""
-#: Step6.class:48
+#: Step6.class:60
msgid "Mount Point"
msgstr ""
-#: Step6.class:49
+#: Step6.class:61
msgid "File System"
msgstr ""
-#: Step6.class:106
+#: Step6.class:133
msgid "Not Used"
msgstr ""
-#: Step6.class:118
+#: Step6.class:154
msgid "Do not format"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "You have already selected"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "as your"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "partition."
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:214
+#: Step6.class:280
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:350
+#: Step6.class:385
msgid "Yes"
msgstr ""
-#: Step6.class:350
+#: Step6.class:385
msgid "No"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Fri Feb 6 14:00:07 2009
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
Startup=MdlStartUp
-Version=0.0.1
+Version=0.0.2
Library=gb.gtk
Library=gb.form
Library=gb.desktop
Added: branches/speedy/ClsFstab.class
==============================================================================
--- (empty file)
+++ branches/speedy/ClsFstab.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,19 @@
+' 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/>.
+
+STATIC PUBLIC sLinuxPartitionsSection AS String
+
Modified: branches/speedy/FMain.class
==============================================================================
--- branches/speedy/FMain.class (original)
+++ branches/speedy/FMain.class Fri Feb 6 14:00:07 2009
@@ -112,6 +112,8 @@
IF NOT bExist THEN
$oCurrent = Object.New(sTmp, [pnlStack])
$oCurrent.Visible = TRUE
+ $oCurrent.width = pnlStack.Width
+ $oCurrent.Height = pnlStack.Height
ELSE
$OCurrent = o
@@ -120,9 +122,9 @@
IF IsNull($oCurrent.GetNext()) THEN btNext.Enabled = FALSE
'Push to the foreground
+
$oCurrent.Raise()
- $oCurrent.width = pnlStack.Width
- $oCurrent.Height = pnlStack.Height
+
$oCurrent.Startup() ' Call each form's startup sub
ME.ListView1.Refresh
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Fri Feb 6 14:00:07 2009
@@ -73,7 +73,7 @@
MoveScaled(29,0,11,2)
Expand = True
Text = ("Back")
- Picture = Picture["icon:/small/previous"]
+ Picture = Picture["icon:/16/previous"]
}
{ Panel5 Panel
MoveScaled(41,1,1,1)
@@ -82,7 +82,7 @@
MoveScaled(43,0,11,2)
Expand = True
Text = ("Next")
- Picture = Picture["icon:/small/next"]
+ Picture = Picture["icon:/16/next"]
}
{ Panel7 Panel
MoveScaled(55,1,1,1)
@@ -91,7 +91,10 @@
MoveScaled(56,0,10,2)
Expand = True
Text = ("Quit")
- Picture = Picture["icon:/small/quit"]
+ Picture = Picture["icon:/16/quit"]
}
+ }
+ { HBox7 HBox
+ MoveScaled(58,55,7,1)
}
}
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Fri Feb 6 14:00:07 2009
@@ -60,7 +60,7 @@
}
}
{ HBox3 HBox
- MoveScaled(2,51,72,3)
+ MoveScaled(2,51,72,2.25)
{ Panel4 Panel
MoveScaled(0,0,17,3)
Expand = True
@@ -73,7 +73,7 @@
MoveScaled(29,0,11,2)
Expand = True
Text = ("Back")
- Picture = Picture["icon:/small/previous"]
+ Picture = Picture["icon:/16/previous"]
}
{ Panel5 Panel
MoveScaled(41,1,1,1)
@@ -82,7 +82,7 @@
MoveScaled(43,0,11,2)
Expand = True
Text = ("Next")
- Picture = Picture["icon:/small/next"]
+ Picture = Picture["icon:/16/next"]
}
{ Panel7 Panel
MoveScaled(55,1,1,1)
@@ -91,7 +91,10 @@
MoveScaled(56,0,10,2)
Expand = True
Text = ("Quit")
- Picture = Picture["icon:/small/quit"]
+ Picture = Picture["icon:/16/quit"]
}
+ }
+ { HBox7 HBox
+ MoveScaled(64,54,7,1)
}
}
Modified: branches/speedy/MdlStartUp.module
==============================================================================
--- branches/speedy/MdlStartUp.module (original)
+++ branches/speedy/MdlStartUp.module Fri Feb 6 14:00:07 2009
@@ -37,12 +37,16 @@
pNow = Picture.Load("images/now.png")
pToDo = Picture.Load("images/square.png")
+ ClsGlobal.fRunningMainForm.listview1.add("Cat0", Space(5)
& "Preparation")
+' ClsGlobal.fRunningMainForm.listview1["Cat0"].Font.bold = TRUE
ClsGlobal.fRunningMainForm.listview1.add("Step0", "Select Language",
pNow)
ClsGlobal.fRunningMainForm.listview1.add("Step1", "Select Media", pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step2", "Disk Partitioning",
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step3", "Software Selection",
pTodo)
+ ClsGlobal.fRunningMainForm.listview1.add("Cat1", Space(5)
& "Installation")
ClsGlobal.fRunningMainForm.listview1.add("Step4", "Installation
Summary", pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step5", "Install VectorLinux",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Cat2", Space(5) & "System
Configuration")
ClsGlobal.fRunningMainForm.listview1.add("Step6", "System Boot Manager",
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step7", "Regional Settings",
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step8", "User Accounts", pToDo)
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Fri Feb 6 14:00:07 2009
@@ -53,7 +53,7 @@
SHELL "mount /dev" &/ Trim(spart) & " /mnt" &/ Trim(spart) & "
2>/dev/null" WAIT
' now mount the iso
'EXEC ["mount -o loop", "/mnt" &/ Trim(spart) &/
Trim(sname), "/mnt/source"] WAIT
- SHELL "mount -o loop /mnt" &/ Trim(spart) &/ Trim(sname) & "
/mnt/source" WAIT
+ SHELL "mount -o loop /mnt" &/ Trim(spart) &/ Trim(sname) & "
/mnt/source 2>/dev/null" WAIT
ELSE
PRINT "Mounting cd media"
@@ -64,11 +64,7 @@
IF ME.GetNext() = "Step2" THEN ClsGlobal.sToScan =
Trim(ME.ComboBox1.Text)
'Message("Image to scan = " & ClsGlobal.sToScan)
-
-
-
-
-
+
END
@@ -91,8 +87,8 @@
PUBLIC FUNCTION GetNext() AS String
- ClsGlobal.fRunningMainForm.listview1["Step1"].picture =
MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
+ ClsGlobal.fRunningMainForm.listview1["Step0"].picture =
MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pNow
IF bcheckmedia.Value = TRUE THEN
RETURN "Step2"
@@ -116,6 +112,7 @@
PUBLIC SUB StartUp() ' Executed every time the Next button is pressed
+ ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
' IF Step2.sLastChecked <> ClsGlobal.sSourceName THEN
' Step2.Close ' try this
' END IF
Modified: branches/speedy/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Fri Feb 6 14:00:07 2009
@@ -42,7 +42,7 @@
{ btRescan Button
MoveScaled(30,0,19,3)
Text = ("Search Again")
- Picture = Picture["icon:/small/refresh"]
+ Picture = Picture["icon:/16/refresh"]
}
}
{ HBox2 HBox
Modified: branches/speedy/Step2.class
==============================================================================
--- branches/speedy/Step2.class (original)
+++ branches/speedy/Step2.class Fri Feb 6 14:00:07 2009
@@ -205,7 +205,7 @@
PUBLIC SUB StartUp()
-
+ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
ME.mbThrobbler.Path = "images/throbber.gif"
'Message("Last scanned image = " & ClsGlobal.sLastScanned)
IF ClsGlobal.sToScan <> ClsGlobal.sLastScanned THEN
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Fri Feb 6 14:00:07 2009
@@ -32,16 +32,18 @@
FMain.btNext.Enabled = TRUE
FMain0.btNext.Enabled = TRUE
+
END
PUBLIC FUNCTION GetNext() AS String
-
+ ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
IF ME.rbAutoPart.Value = TRUE THEN
'no module for auto partition written yet
'Message("Not ready yet")
- RETURN
+ RETURN "Step3a"
END IF
IF ME.rbCustomPart.Value = TRUE THEN
'embed gparted
@@ -56,8 +58,9 @@
END
PUBLIC SUB StartUp()
- FMain.btNext.Enabled = TRUE
- FMain0.btNext.Enabled = TRUE
+ ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
+ ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
+
END
PUBLIC SUB OnExit()
Modified: branches/speedy/Step3.form
==============================================================================
--- branches/speedy/Step3.form (original)
+++ branches/speedy/Step3.form Fri Feb 6 14:00:07 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,64,64)
+ MoveScaled(0,0,66,51)
Text = ("")
Arrangement = Arrange.Row
{ HPanel1 HPanel
Added: branches/speedy/Step3a.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,52 @@
+' 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 Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Automatic Partitioning Options") & "</h2>"
+ ME.tlActionExp.Text = ("Select one of the following options")
+ ME.tlEntireDisc.Text = ("Allow VectorLinux to use an entire hard disk in
your system.") & "<br>" &
+ "<b>" & ("This option will wipe out any data on the disk you select.")
& "</b>"
+ ME.tlFreeSpace.Text = ("Locate free space on hard disk and install
VectorLinux there.") & "<br>" &
+ "<i>" & ("This option will not erase any data off your hard drive")
& "</i>"
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+PUBLIC FUNCTION GetNext() AS String
+
+ IF ME.rbEntireDisk.Value = TRUE THEN
+ RETURN "Step3a1"
+ ELSE
+ RETURN "Step3a2"
+ END IF
+
+
+
+END
+
Added: branches/speedy/Step3a.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a.form Fri Feb 6 14:00:07 2009
@@ -0,0 +1,63 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,84,47)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(1,6,74,6)
+ Expand = True
+ { tlActionExp TextLabel
+ MoveScaled(2,1,4,3)
+ Expand = True
+ Text = ("TextLabel1")
+ }
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,13,79,20)
+ Expand = True
+ { rbFreeSpace RadioButton
+ MoveScaled(1,1,22,3)
+ Expand = True
+ Text = ("Use Free space on my hard disk")
+ }
+ { Panel2 Panel
+ MoveScaled(2,4,3,3)
+ }
+ { tlFreeSpace TextLabel
+ MoveScaled(5,4,19,4)
+ Expand = True
+ Text = ("")
+ }
+ { HBox2 HBox
+ MoveScaled(1,6,6,2)
+ Expand = True
+ }
+ { rbEntireDisk RadioButton
+ MoveScaled(2,9,34,3)
+ Expand = True
+ Text = ("Use entire disk")
+ }
+ { Panel1 Panel
+ MoveScaled(2,12,3,3)
+ }
+ { tlEntireDisc TextLabel
+ MoveScaled(6,12,32,4)
+ Expand = True
+ Text = ("")
+ }
+ }
+}
Added: branches/speedy/Step3a1.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a1.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,36 @@
+' 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 Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Use Entire Hard Disk") & "</H2>"
+
+END
+PUBLIC FUNCTION GETNEXT() AS String
+
+
+
+END
+PUBLIC SUB ONEXIT()
+
+
+
+END
+PUBLIC SUB STARTUP()
+
+
+
+END
Added: branches/speedy/Step3a1.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a1.form Fri Feb 6 14:00:07 2009
@@ -0,0 +1,20 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,67,45)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+}
Added: branches/speedy/Step3a2.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a2.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,136 @@
+' 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/>.
+
+PRIVATE lLargest AS Long
+PRIVATE sLargestDev AS String
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Install VectorLinux to free space on
disk") & "</H2>"
+
+
+END
+
+PUBLIC SUB LIST_FREE_SPACE()
+
+ DIM sDiscs, sLine AS String[]
+ DIM sDisc, sDump, sFreeDump AS String
+ DIM lFreeSpace AS Float ' free space in KB
+ DIM lTotalFreeKb, lFreeBegin, lFreeEnd AS Long
+ DIM sFreeBeinRaw, sFreeEndRaw AS String
+ DIM i AS Integer
+ DIM lTotalRam AS Long
+
+
+ PRINT " -*- Determing total RAM available ..."
+ SHELL "free | grep -i \"^Mem\" | tr -s \' \',\"\" | cut -f 2 -d \' \'"
TO sDump
+ lTotalRam = Trim(sDump)
+
+ PRINT " -+- Total RAM Available : " & lTotalRam & " KB"
+ PRINT " -*- Calculating available free space"
+
+ SHELL "probedisk | grep -v cdrom | cut -f 1 -d \'|\'" TO sDump
+ sDump = Trim(sDump)
+ IF NOT sDump THEN ' EXIT IF NO HARD DRIVES ARE FOUND
+ Message.Error(("No hard disks found on your system. Please
select") & "<br>" &
+ ("Another partitioning option"))
+ RETURN
+ END IF
+
+ sDiscs = Split(sDump, "\n")
+ FOR i = 0 TO sDiscs.Max
+ sDisc = Trim(sDiscs[i])
+ ' get the free space from parted
+ SHELL "parted " & Trim(sDisc) & " print free | grep -i \"free
space\" | tr -s \' \',\"\"" TO sDump
+ sDump = Trim(sDump)
+ IF NOT sDump THEN CONTINUE
+ ' free space should be on the 3rd column, but it start with a
blank space, so it will be 4th
+ sLine = Split(sDump, Space(1))
+ sFreeDump = Trim(sLine[2])
+ sFreeBeinRaw = Trim(sLine[0]) ' Beginning of free space
+ sFreeEndRaw = Trim(sLine[1]) ' End of free space
+ Message("Free space on " & sDisc & " begins at " &
ME.ConvertToKb(sFreeBeinRaw) & "kb and ends at " &
ME.ConvertToKb(sFreeEndRaw) & " kb")
+
+ 'Message(sFreeDump)
+ lFreeSpace = Left(sFreeDump, Len(sFreeDump) - 2) ' take away
the KB,MB,GB,TB off the result
+ ' fix the units by converting everything to kb
+ lTotalFreeKb = ME.ConvertToKb(sFreeDump)
+ IF lTotalFreeKb > lLargest THEN
+ lLargest = lTotalFreeKb
+ sLargestDev = sDisc
+ END IF
+
+ PRINT " -+- Found " & lTotalFreeKb & " KB in " & sDisc
+
+
+'NOTES
+' root:# parted /dev/hda --script "mkpartfs primary linux-swap -512kb
-1kb" ' SAMPLE PARTED LINE
+' if ram < 512MB then swap = ram*2
+' default / fs = reiserfs
+
+
+
+
+
+ NEXT
+
+ Message("Largest unused area found: " & sLargestDev & " with " &
lLargest & " kb of unused space")
+
+
+
+END
+
+
+PUBLIC SUB ConvertToKb(sRawString AS String) AS Long
+
+ DIM fSize AS Float
+ DIM sTrimmed AS Float = Left(sRawString, Len(sRawString) - 2)
+ DIM sTotal AS Long
+
+ IF sRawString LIKE "*mb*" THEN
+ fSize = sTrimmed
+ sTotal = fSize * 1024
+ ELSE IF sRawString LIKE "*gb*" THEN
+ fSize = sTrimmed
+ sTotal = (fSize * 1024) * 1024
+ END IF
+
+ RETURN sTotal
+
+
+
+
+END
+
+
+
+
+PUBLIC FUNCTION GETNEXT() AS String
+
+
+
+END
+PUBLIC SUB STARTUP()
+
+ ME.LIST_FREE_SPACE()
+
+END
+
+PUBLIC SUB ONEXIT()
+
+
+
+END
Added: branches/speedy/Step3a2.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a2.form Fri Feb 6 14:00:07 2009
@@ -0,0 +1,20 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,67,46)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+}
Added: branches/speedy/Step4.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step4.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,177 @@
+' 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 PartLabels AS Object[]
+PUBLIC PartUseages AS Object[]
+
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Automatic Disc Partitioning") & "</h2>"
+ 'WAIT 1
+
+ 'ME.GET_PARTITION_SIZES()
+ 'ME.StartUp()
+END
+
+
+PUBLIC SUB GET_PARTITION_SIZES()
+
+ DIM sMounted, sToMount, sAdd, sDfResults, sPartType AS String
+ DIM sSize, sUsed, sFree AS Long
+ DIM sProgShade AS Variant
+ DIM sList, sLine AS String[]
+ DIM i, y, n, c AS Integer
+
+ ME.PartUseages = NEW Object[]
+ SHELL "mount | grep \"^/dev\" | cut -f 1 -d \' \'" TO sMounted
+ SHELL "probepart | grep \"^/dev\" | grep -v swap | tr -s \' \',\"\" |
cut -f 1 -d \' \'" TO sToMount
+ sMounted = Trim(sMounted)
+ sToMount = Trim(sToMount)
+ sList = Split(sToMount, "\n")
+ y = 4
+ FOR i = 0 TO sList.Max ' new trick here.. ;)
+ n = 0
+ c = 0
+ sAdd = Right(Trim(sList[i]), Len(Trim(sList[i])) -
RInStr(Trim(sList[i]), "/"))
+ IF InStr(sMounted, sAdd) = FALSE THEN
+ 'mount it
+
+ 'Message("To mount " & sAdd)
+ 'TRY MKDIR "/mnt" &/ Trim(sadd) & " 2>/dev/null"
+ 'EXEC ["mkdir", "/mnt" &/ Trim(sadd), "2>/dev/null"] WAIT
+ SHELL "mkdir -p /mnt" &/ Trim(sadd) & " 2>/dev/null" WAIT
+ SHELL "mount " & Trim(sList[i]) & " /mnt" &/ Trim(sadd) & "
2>/dev/null" WAIT
+
+ ' get the status from df
+ SHELL "df -T | grep \"^" & Trim(sList[i]) & "\" | tr -s \'
\',\"\"" TO sDfResults
+ sDfResults = Trim(sDfResults)
+ SHELL "umount /mnt" &/ Trim(sadd) & " 2>/dev/null" WAIT
+ 'Message(sDfResults)
+ 'This will RETURN something LIKE
+ ' Device FS Type Size USED AVAILA % MountPoint
+ '/dev/hdb1 reiserfs 7863500 4865520 2997980 62% /
+ ' calculate useage by this formula
+ ' Used / Size
+ sLine = Split(sDfResults, Space(1))
+ sSize = sLine[2]
+ sUsed = sLine[3]
+ sFree = sLine[4]
+ sPartType = sLine[1]
+ sProgShade = (sUsed / sSize) * 100
+ ' Graphical display of partition useage
+ sProgShade = Round(CFloat(sProgShade), 0)
+ 'Message(Round(CFloat(sProgShade), 0))
+
+
+ tlPart = NEW TextLabel(ME.panel1)
+ WITH tlPart
+ .Text = Trim(sList[i])
+ .tag = Trim(sList[i])
+ .Width = 100
+ .Expand = FALSE
+ .ToolTip = sPartType
+ .Alignment = Align.Normal
+ .Height = 21
+ .Move(4, y)
+ END WITH
+
+ gvuseage = NEW GridView(ME.Panel1)
+ WITH gvuseage
+ .Height = 21
+ .Expand = TRUE
+ .ScrollBar = FALSE
+ .Columns.Count = 100
+ .Rows.Count = 1
+ .Tag = Trim(sList[i])
+ .Move(tlPart.Left + tlPart.Width + 8, y)
+
+ 'Message(CInt(sProgShade))
+ REPEAT
+ gvuseage.Columns[c].Width = gvuseage.Width /
100
+ INC c
+ UNTIL c = gvuseage.Columns.Count - 1
+
+ IF CInt(sProgShade) > 0 THEN
+ REPEAT
+ 'gvuseage[0, n].BackColor =
Color.LightBackground
+ gvuseage[0, n].BackColor = Color.DarkGreen
+
+ INC n
+ UNTIL n = CInt(sProgShade)
+ END IF
+ 'n = 0
+ END WITH
+ ME.PartUseages.Add(gvuseage)
+ 'gvuseage[0, 0].Text = sPartType
+
+ ' pbUseage = NEW ProgressBar(ME.Panel1)
+ ' WITH pbUseage
+ ' .Height = 21
+ ' .Expand = TRUE
+ ' .Width = 300
+ ' .Tag = Trim(sList[i])
+ ' .Move(tlPart.left + tlPart.Width + 8, y)
+ ' .Value = sUsed / sSize
+ ' END WITH
+ y = y + tlPart.Height + 8
+ END IF
+ NEXT
+
+END
+
+
+
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Step6"
+
+
+END
+PUBLIC SUB StartUp()
+
+ ME.PartUseages = NEW Object[]
+ ME.GET_PARTITION_SIZES()
+ ME.Resize(ClsGlobal.fRunningMainForm.PnlStack.width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+
+
+PUBLIC SUB Form_Resize()
+
+ DIM gv AS GridView
+ DIM n AS Integer
+
+ IF NOT ME.PartUseages THEN RETURN
+ FOR EACH gv IN ME.PartUseages
+ n = 0
+ gv.Grid = FALSE
+ REPEAT
+ gv.Columns[n].Width = gv.Width / 100
+ INC n
+ UNTIL n = gv.Columns.Count - 1
+ NEXT
+
+
+
+END
Added: branches/speedy/Step4.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step4.form Fri Feb 6 14:00:07 2009
@@ -0,0 +1,38 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,49)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { Panel1 Panel
+ MoveScaled(1,6,62,10)
+ Expand = True
+ Arrangement = Arrange.Row
+ }
+ { tlPart TextLabel
+ MoveScaled(1,25,6,3)
+ Visible = False
+ Text = ("")
+ }
+ { pbUseage ProgressBar
+ MoveScaled(8,25,7,3)
+ Visible = False
+ }
+ { gvuseage GridView
+ MoveScaled(11,29,46,13)
+ Visible = False
+ }
+}
Modified: branches/speedy/Step5.class
==============================================================================
--- branches/speedy/Step5.class (original)
+++ branches/speedy/Step5.class Fri Feb 6 14:00:07 2009
@@ -28,7 +28,7 @@
PUBLIC SUB StartUp()
-
+ ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
ME.EMBED_GPARTED()
END
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Fri Feb 6 14:00:07 2009
@@ -28,19 +28,31 @@
PUBLIC SUB OnExit()
-
+ DIM n AS Integer
+ DIM sFmtAs AS String
+ FOR n = 1 TO gvPartListing.Rows.Count - 1
+ IF gvPartListing[n, 2].Text THEN
+ IF gvPartListing[n, 4].Text THEN
+ sFmtAs = gvPartListing[n, 4].Text
+ ELSE
+ sFmtAs = gvPartListing[n, 5].Text
+ END IF
+ END IF
+ Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n,
2].Text & gb.NewLine & sFmtAs)
+
+ NEXT
END
PUBLIC SUB StartUp()
-
+ ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
END
PUBLIC SUB PREPARE_PARTITION_LISTING()
WITH ME.gvPartListing
- .Columns.Count = 6
+ .Columns.Count = 7
.Rows.count = 1
END WITH
gvPartListing[0, 0].text = ("Partition")
@@ -50,19 +62,22 @@
'gvPartListing[0, 4].text = ("File System")
gvPartListing[0, 0].BackColor = Color.LightBackground
gvPartListing[0, 0].Font.Bold = TRUE
+ gvPartListing.Columns[0].Width = 120
gvPartListing[0, 1].BackColor = Color.LightBackground
gvPartListing[0, 1].Font.Bold = TRUE
+ gvPartListing.Columns[1].Width = 120
gvPartListing[0, 2].BackColor = Color.LightBackground
gvPartListing[0, 2].Font.Bold = TRUE
- gvPartListing.Columns[2].Width = 120
+ gvPartListing.Columns[2].Width = 150
gvPartListing[0, 3].BackColor = Color.LightBackground
gvPartListing[0, 3].Font.Bold = TRUE
- gvPartListing.Columns[3].Width = 8
+ gvPartListing.Columns[3].Width = 12
gvPartListing[0, 4].BackColor = Color.LightBackground
- gvPartListing.Columns[4].Width = 120
+ gvPartListing.Columns[4].Width = 150
gvPartListing[0, 4].Font.Bold = TRUE
- gvPartListing[0, 5].BackColor = Color.LightBackground
- gvPartListing[0, 5].Font.Bold = TRUE
+ 'gvPartListing[0, 5].BackColor = Color.LightBackground
+ 'gvPartListing[0, 5].Font.Bold = TRUE
+ 'gvPartListing[0, 5]
END
@@ -96,17 +111,31 @@
ME.gvPartListing[irow, 1].Text = Trim(sSize)
IF sFs LIKE "linux-swap" THEN
gvPartListing[irow, 4].Text = Trim(sfs)
+ gvPartListing[irow, 0].BackColor = Color.LightGray
+ gvPartListing[irow, 1].BackColor = Color.LightGray
+ gvPartListing[irow, 2].BackColor = Color.LightGray
+ gvPartListing[irow, 3].BackColor = Color.LightGray
+ gvPartListing[irow, 4].BackColor = Color.LightGray
+
ELSE
+ gvPartListing[irow, 5].Text = Trim(SFS)
+ gvPartListing[irow, 5].ForeColor = Color.White
+
cbMntPoint = NEW ComboBox(gvPartListing.Parent)
AS "MountPointSel"
WITH cbMntPoint
.Move(gvPartListing[irow, 2].left, gvPartListing[irow,
2].top)
.Width = gvPartListing[irow, 2].Width
.Height = gvPartListing[irow, 2].Height
.ReadOnly = TRUE
- .list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
- .Text = ("Not Used")
.tag = gvPartListing[irow, 0].Text
- '.ReadOnly = TRUE
+ IF ClsGlobal.sSourceAddr LIKE .Tag THEN
+ '.Enabled = FALSE
+ .List = [("Not Used"), "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
+ ELSE
+ .list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
+ '.Enabled = TRUE
+ END IF
+ .Text = ("Not Used")
END WITH
objMntPoints.Add(cbMntPoint)
cbfs = NEW ComboBox(gvPartListing.Parent) AS "FsSel"
@@ -115,9 +144,15 @@
.Width = gvPartListing[irow, 4].Width
.Height = gvPartListing[irow, 4].Height
.ReadOnly = TRUE
+ .tag = gvPartListing[irow, 0].Text
+ 'Message(ClsGlobal.sSourceAddr)
+ IF ClsGlobal.sSourceAddr LIKE .Tag THEN
+ .Enabled = FALSE
+ ELSE
+ .Enabled = TRUE
+ END IF
.list = [("Do not
format"), "ext2", "ext3", "jfs", "xfs", "reiserfs"]
.Text = ("Do not format")
- .tag = gvPartListing[irow, 0].Text
.Enabled = FALSE
END WITH
objFS.Add(cbFS)
@@ -138,14 +173,18 @@
x = LAST.x
y = LAST.y
+
+
IF LAST.text <> ("Do not format") THEN
ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = LAST.text
+ ME.OnExit()
ELSE
ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = ""
END IF
'IF ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text THEN
Message(ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text)
+ ME.MOUNT_TARGET_PARTITIONS()
END
@@ -186,7 +225,14 @@
IF LAST.text <> ("Not Used") THEN
FOR EACH cb IN objFS
- IF cb.tag = LAST.tag THEN cb.Enabled = TRUE
+
+ IF cb.tag = LAST.tag THEN
+ IF ClsGlobal.sSourceAddr LIKE LAST.tag THEN
+ cb.Enabled = FALSE
+ ELSE
+ cb.Enabled = TRUE
+ END IF
+ END IF
NEXT
' save the text in the background to the gridview
@@ -201,14 +247,34 @@
+
+END
+
+
+PUBLIC SUB MOUNT_TARGET_PARTITIONS()
+
+ DIM n AS Integer
+ DIM sPartAddr, sMntPoint, sFs AS String
+ FOR n = 2 TO gvPartListing.Rows.count - 1 ' rows 0 and 1 are
meaningless to this sub
+ IF gvPartListing[n, 2].Text THEN ' Partition address in in column 0,
mountpoint is in column 2
+ sMntPoint = Trim(gvPartListing[n, 2].Text)
+ sPartAddr = Trim(gvPartListing[n, 0].Text)
+ sfs = Trim(gvPartListing[n, 4].Text)
+ IF NOT sfs THEN sfs = Trim(gvPartListing[n, 5].Text) ' use the
current filesystem.
+ ' maybe this is a good time to store these values to the future
fstab file ??
+ ' use ClsFstab class to store these things until we need them in
configure.
+
+ 'Message(sPartAddr & "\n" & sMntPoint & "\n" & sFs)
-
+ END IF
+ NEXT
END
+
PUBLIC SUB Form_Open()
ME.tlbanner.Text = "<h2>" & ("Select which partitions to use for
installation") & "</h2>"
@@ -231,7 +297,6 @@
PUBLIC SUB gvPartListing_Click()
-'DIM x, y AS Integer
IF LAST.row < 2 THEN RETURN
x = LAST.column
@@ -245,28 +310,8 @@
ME.cbMntPoint.Visible = TRUE
END IF
-
-
-'
END
-
-PUBLIC SUB cbMntPoint_Change()
-
- 'DIM x, y AS Integer
-
- 'x = gvPartListing.ColumnAt(LAST.x)
- 'y = gvPartListing.RowAt(LAST.y)
- '
- ' IF y < 2 THEN RETURN
- ' IF LAST.text = ("Not Used") THEN LAST.text = ""
- ' gvPartListing[y, x].Text = Trim(LAST.text)
- ' LAST.visible = FALSE
-
-
-END
-
-
PUBLIC SUB cbYN_Click()
gvPartListing[y, x].Text = cbYN.Text
@@ -276,13 +321,3 @@
END
-
-
-
-PUBLIC SUB cbYN_Leave()
-
- ' 'Message("leave")
- ' gvPartListing[y, x].Text = cbYN.Text
- ' cbYN.Visible = FALSE
-
-END
|
