|
From: <cod...@go...> - 2008-12-04 22:29:28
|
Author: M0...@gm...
Date: Thu Dec 4 14:27:59 2008
New Revision: 370
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmDiskPart.class
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
- Added test to check for existing partitions before offering to use
existing partitions
This way if no partitions are found (unpartitioned hard drive) the user
will be lead into gparted
- Updated binary
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 14:27:59 2008
@@ -70,55 +70,55 @@
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:353
+#: FMain.class:364
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:355
+#: FMain.class:366
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:355
+#: FMain.class:366
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:369
+#: FMain.class:380
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:441
+#: FMain.class:452
msgid "Skipping boot loader setup"
msgstr ""
-#: FMain.class:467
+#: FMain.class:478
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:483
+#: FMain.class:494
msgid "Please enter the root password. For your security purposes, do not
leave this blank"
msgstr ""
-#: FMain.class:501
+#: FMain.class:512
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:501
+#: FMain.class:512
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:828
+#: FMain.class:839
msgid "Back"
msgstr ""
-#: FMain.class:839
+#: FMain.class:850
msgid "Exit Installation"
msgstr ""
-#: FMain.class:850
+#: FMain.class:861
msgid "Next"
msgstr ""
-#: FMain.class:864
+#: FMain.class:875
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Dec 4 14:27:59 2008
@@ -18,7 +18,7 @@
msgid "When finished making changes, exit the partitioning application to
continue ..."
msgstr ""
-#: FrmDiskPart.class:119
+#: FrmDiskPart.class:120
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Dec 4 14:27:59 2008
@@ -14,27 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:199
+#: MdlSetup.module:216
msgid "Calculating package count ... Please wait"
msgstr ""
-#: MdlSetup.module:255
+#: MdlSetup.module:272
msgid "Total bulks to be installed = "
msgstr ""
-#: MdlSetup.module:258
+#: MdlSetup.module:275
msgid "Total pkgs to be installed = "
msgstr ""
-#: MdlSetup.module:301
+#: MdlSetup.module:318
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:317
+#: MdlSetup.module:334
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:319
+#: MdlSetup.module:336
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 14:27:59 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.48
+Version=0.1.11
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Thu Dec 4 14:27:59 2008
@@ -1,4 +1,3 @@
-- Fixed missing format? indicator for non-linux partitions (win)
-- Extended blue background for swap partition row to the 4th column.
-- Allowed user to mount the host partition (on hosted install) to
/mnt/hdxx only.
-- Fixed problem with back navigation... users getting locked out.
+- Added test to check for existing partitions before offering to use
existing partitions
+ This way if no partitions are found (unpartitioned hard drive) the user
will be lead into gparted
+- Updated binary
\ No newline at end of file
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 14:27:59 2008
@@ -342,6 +342,17 @@
END IF
frmNext = FrmPartScheme
+ ' Try to determine if partitions are available before offering to
select.
+ IF MdlSetup.QUICK_PARTITION_PROBE() = 0 THEN
+ FrmPartScheme.rbUseExisting.Enabled = FALSE
+ FrmPartScheme.rbUseExisting.ForeColor = Color.Gray
+ ELSE
+ FrmPartScheme.rbUseExisting.Enabled = TRUE
+ FrmPartScheme.rbUseExisting.Color = Color.Black
+ END IF
+
+
+
CASE "FrmPartScheme"
' The next form is defined from the radio buttons in Frm
PartScheme. But let's see if we can display some status text
Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class (original)
+++ branches/iVL/FrmDiskPart.class Thu Dec 4 14:27:59 2008
@@ -66,10 +66,11 @@
MdlCore.WARN_STATUS("")
FrmDiskPart.tlBanner.Text = "<h3><br>Analyzing system partitioning
scheme... Please wait<br>This will take a few seconds...</h3>"
+ MdlCore.WARN_STATUS("")
FrmDiskPart.tlBanner.Refresh
FrmDiskPart.tlBanner.Adjust
'Message("Exiting GParted")
- MdlCore.warn_status_off()
+ 'MdlCore.warn_status_off()
WAIT 1
bReboot = MdlSetup.CHECK_IF_REBOOT_NEEDED()
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Dec 4 14:27:59 2008
@@ -15,6 +15,23 @@
' 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 FUNCTION QUICK_PARTITION_PROBE() AS Integer
+
+ DIM sDump AS String
+ SHELL "probepart | grep ^/dev" TO sDump
+ sDump = Trim(sDump)
+ IF Len(sDump) > 0 THEN
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
+
+
+END
+
+
+
PUBLIC SUB GO_WITH_SELECTED(sDev AS String, sISONAME AS String) ' this
will mount the drive and display the license agreement
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|