Files changed:

Utils.module - added comment Functions.module - terabyte parsing in AutoUnits function frmChoice.form - changed the button names frmWelcome.form - changed the button names frmPartitions.form - changed the button names frmChoice.class - changed the button names frmPartitions.class - changed the button names InputBox.class - changed the button names, added comment in copyright notice frmConfig.form - changed the button names frmGO.class - changed the button names frmPackages.form - changed the button names frmPackages.class - changed the button names frmMain.form - changed the button names frmMain.class - changed the button names frmWelcome.class - changed the button names frmTools.form - changed the button names frmTools.class - changed the button names InputBox.form - changed the button names frmConfig.class - changed the button names
Joe1962 · Aug 5, 2007 · 8df72e9 · 8df72e9
1 parent bdf3466
commit 8df72e9
Show file tree

Hide file tree

Showing 39 changed files with 199 additions and 296 deletions.
diff --git a/.lang/.pot b/.lang/.pot
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: frmChoice.class:92
+#: frmChoice.class:91
 msgid ""
 "<center><h3><b>You have 3 choices:</b></h3></center>\n"
 "\n"
@@ -47,23 +47,23 @@ msgid ""
 "</ul>\n"
 msgstr ""
 
-#: frmChoice.class:103
+#: frmChoice.class:102
 msgid "Choose install type"
 msgstr ""
 
-#: frmChoice.class:118
+#: frmChoice.class:117
 msgid "Install types"
 msgstr ""
 
-#: frmChoice.class:123
+#: frmChoice.class:122
 msgid "Full-automatic"
 msgstr ""
 
-#: frmChoice.class:129
+#: frmChoice.class:128
 msgid "Semi-automatic"
 msgstr ""
 
-#: frmChoice.class:135
+#: frmChoice.class:134
 msgid "Advanced"
 msgstr ""
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Exit"
 msgstr ""
 
-#: frmPackages.class:99
+#: frmPackages.class:97
 msgid ""
 "<center><h3><b>Package selection strategies:</b></h3></center>\n"
 "\n"
@@ -203,31 +203,31 @@ msgid ""
 "</ul>\n"
 msgstr ""
 
-#: frmPackages.class:111
+#: frmPackages.class:109
 msgid "Package selection"
 msgstr ""
 
-#: frmPackages.class:126
+#: frmPackages.class:124
 msgid "Assisted selection"
 msgstr ""
 
-#: frmPackages.class:131
+#: frmPackages.class:129
 msgid "All packages"
 msgstr ""
 
-#: frmPackages.class:137
+#: frmPackages.class:135
 msgid "By groups"
 msgstr ""
 
-#: frmPackages.class:144
+#: frmPackages.class:142
 msgid "Advanced selection"
 msgstr ""
 
-#: frmPackages.class:149 frmPartitions.class:266
+#: frmPackages.class:147 frmPartitions.class:266
 msgid "Manual"
 msgstr ""
 
-#: frmPackages.class:155
+#: frmPackages.class:153
 msgid "No extras"
 msgstr ""
 

diff --git a/.lang/Functions.pot b/.lang/Functions.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/Functions.module
+# /home/easuter/vinstall-ng/Functions.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/Global.pot b/.lang/Global.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/Global.class
+# /home/easuter/vinstall-ng/Global.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/InputBox.pot b/.lang/InputBox.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/InputBox.class
+# /home/easuter/vinstall-ng/InputBox.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/Main.pot b/.lang/Main.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/Main.module
+# /home/easuter/vinstall-ng/Main.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/Utils.pot b/.lang/Utils.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/Utils.module
+# /home/easuter/vinstall-ng/Utils.module
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/cDiskInfo.pot b/.lang/cDiskInfo.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/cDiskInfo.class
+# /home/easuter/vinstall-ng/cDiskInfo.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/cPartInfo.pot b/.lang/cPartInfo.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/cPartInfo.class
+# /home/easuter/vinstall-ng/cPartInfo.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/cPartInstall.pot b/.lang/cPartInstall.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/cPartInstall.class
+# /home/easuter/vinstall-ng/cPartInstall.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/frmChoice.pot b/.lang/frmChoice.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmChoice.class
+# /home/easuter/vinstall-ng/frmChoice.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,27 +14,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: frmChoice.class:92
+#: frmChoice.class:91
 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:103
+#: frmChoice.class:102
 msgid "Choose install type"
 msgstr ""
 
-#: frmChoice.class:118
+#: frmChoice.class:117
 msgid "Install types"
 msgstr ""
 
-#: frmChoice.class:123
+#: frmChoice.class:122
 msgid "Full-automatic"
 msgstr ""
 
-#: frmChoice.class:129
+#: frmChoice.class:128
 msgid "Semi-automatic"
 msgstr ""
 
-#: frmChoice.class:135
+#: frmChoice.class:134
 msgid "Advanced"
 msgstr ""
 
diff --git a/.lang/frmConfig.pot b/.lang/frmConfig.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmConfig.class
+# /home/easuter/vinstall-ng/frmConfig.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/frmDriveSelect.pot b/.lang/frmDriveSelect.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmDriveSelect.class
+# /home/easuter/vinstall-ng/frmDriveSelect.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/frmGO.pot b/.lang/frmGO.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmGO.class
+# /home/easuter/vinstall-ng/frmGO.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/frmMain.pot b/.lang/frmMain.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmMain.class
+# /home/easuter/vinstall-ng/frmMain.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/frmPackages.pot b/.lang/frmPackages.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmPackages.class
+# /home/easuter/vinstall-ng/frmPackages.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,35 +14,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: frmPackages.class:99
+#: frmPackages.class:97
 msgid "<center><h3><b>Package selection strategies:</b></h3></center>\n\n<b><u>Assisted selection:</u></b> Maintains dependency coherency.\n<ul>\n<li><b>All packages:</b> Equivalent to a full distro install. All included packages will be installed to your hard disk.</li>\n<li><b>Package groups:</b> Allow selection of what to install by logical package groupings.</li>\n</ul>\n<b><u>Advanced selection:</u></b> <font color=\"#FF0000\">WARNING: you will be responsible for what you install or not.</font>\n<ul>\n<li><b>Manual selection:</b> Manual selection from the full list of packages, sorted by categories.</li>\n<li><b>No extra packages:</b> Install just the Vector Linux base distro. You know what you really want and will customise the install yourself.</font></li>\n</ul>\n"
 msgstr ""
 
-#: frmPackages.class:111
+#: frmPackages.class:109
 msgid "Package selection"
 msgstr ""
 
-#: frmPackages.class:126
+#: frmPackages.class:124
 msgid "Assisted selection"
 msgstr ""
 
-#: frmPackages.class:131
+#: frmPackages.class:129
 msgid "All packages"
 msgstr ""
 
-#: frmPackages.class:137
+#: frmPackages.class:135
 msgid "By groups"
 msgstr ""
 
-#: frmPackages.class:144
+#: frmPackages.class:142
 msgid "Advanced selection"
 msgstr ""
 
-#: frmPackages.class:149
+#: frmPackages.class:147
 msgid "Manual"
 msgstr ""
 
-#: frmPackages.class:155
+#: frmPackages.class:153
 msgid "No extras"
 msgstr ""
 
diff --git a/.lang/frmPartSelect.pot b/.lang/frmPartSelect.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmPartSelect.class
+# /home/easuter/vinstall-ng/frmPartSelect.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/frmPartitioner.pot b/.lang/frmPartitioner.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmPartitioner.class
+# /home/easuter/vinstall-ng/frmPartitioner.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/frmPartitions.pot b/.lang/frmPartitions.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmPartitions.class
+# /home/easuter/vinstall-ng/frmPartitions.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/frmTools.pot b/.lang/frmTools.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmTools.class
+# /home/easuter/vinstall-ng/frmTools.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/.lang/frmWelcome.pot b/.lang/frmWelcome.pot
@@ -1,4 +1,4 @@
-# /home/joe1962/develop/2-cvs/vl-gui-installer/frmWelcome.class
+# /home/easuter/vinstall-ng/frmWelcome.class
 # Generated by Gambas compiler
 
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

diff --git a/Functions.module b/Functions.module
@@ -14,16 +14,16 @@ ELSE IF capacity < 1000000 THEN ' Kilobytes:
 ELSE IF capacity < 1000000000 THEN ' Megabytes:
    RETURN Format$(capacity / 1048576, "###,###,###,###") & ";MB"
    'gridDisk[m + 1,units].Text = "MB"
-ELSE ' Gigabytes:
+ELSE IF capacity < 1000000000000 ' Gigabytes:
    RETURN Format$(capacity / 1073741824, "####,###,###,###") & ";GB"
+ELSE 'Terabytes
+   RETURN Format$(capacity / 1099511627776, "####,###,###,###") & ";TB"
 END IF
 
-' What about Terabytes? LOL.
-
 END
 
 PUBLIC FUNCTION getPartType(t AS String) AS String
-' Return partition type string from partition type code:
+' Return partition type (t) string from partition type code:
 
 IF Trim$(t) = "0" THEN RETURN "Empty"
 IF Trim$(t) = "1" THEN RETURN "FAT12"

diff --git a/InputBox.class b/InputBox.class
@@ -9,7 +9,7 @@
 ' Version Date: Febuuary 2006
 ' Version History:
 '
-' TWEAKED BY JOE1962
+' TWEAKED BY JOE1962, easuter
 '
 '''
 ' Licence Information
@@ -155,13 +155,13 @@ PRIVATE FUNCTION DefaultValue_Read() AS String
   RETURN TextBox1.Text
 END
 
-PUBLIC SUB ButtonOK_Click()
+PUBLIC SUB btnOK_Click()
   ' Set the value to be returned by the Input static method
   returnValue = TextBox1.Text
   ME.Close
 END
 
-PUBLIC SUB ButtonCancel_Click()
+PUBLIC SUB btnCancel_Click()
   ME.Close
 END
 

diff --git a/InputBox.form b/InputBox.form
@@ -1,35 +1,30 @@
-# Gambas Form File 1.0
+# Gambas Form File 2.0
 
 { Form Form
-  MoveScaled(32.375,12.625,30,12)
-  'Move(259,101,240,96)
+  MoveScaled(32.2857,12.5714,30,12)
   Font = Font["Luxi Sans"]
   Text = ("")
   Border = Window.Fixed
   SkipTaskbar = True
   { TextLabelPrompt TextLabel
     MoveScaled(1,0,28,3)
-    'Move(8,0,224,24)
     Font = Font["Luxi Sans"]
     Text = ("Enter a value:")
   }
-  { ButtonOK Button
+  { btnOK Button
     MoveScaled(1,7,12,4)
-    'Move(8,56,96,32)
     Font = Font["Luxi Sans"]
     Text = ("OK")
     Default = True
   }
-  { ButtonCancel Button
+  { btnCancel Button
     MoveScaled(17,7,12,4)
-    'Move(136,56,96,32)
     Font = Font["Luxi Sans"]
     Text = ("Cancel")
     Cancel = True
   }
   { TextBox1 TextBox
     MoveScaled(1,3,28,3)
-    'Move(8,24,224,24)
     Font = Font["Luxi Sans"]
     Text = ("")
   }