Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r270 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-07 15:21:46
|
Author: M0E.lnx
Date: Fri Nov 7 07:12:36 2008
New Revision: 270
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/.project
branches/iVL/FMain.class
branches/iVL/FrmLilo.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlCore.module
branches/iVL/MdlLiloOsList.module
branches/iVL/installer.gambas
Log:
- Added -C argument support to jump straight to the configure stage
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/.project
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsGlobal.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsPartSel.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsWinDrives.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,95 +14,95 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:177
+#: FMain.class:185
msgid "Restart"
msgstr ""
-#: FMain.class:212
+#: FMain.class:233
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:214
+#: FMain.class:235
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:214
+#: FMain.class:235
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:228
+#: FMain.class:249
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:283
+#: FMain.class:304
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:284
+#: FMain.class:305
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:295
+#: FMain.class:316
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:309
+#: FMain.class:330
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:324
+#: FMain.class:345
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:324
+#: FMain.class:345
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:324
+#: FMain.class:345
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:324
+#: FMain.class:345
msgid "Yes"
msgstr ""
-#: FMain.class:324
+#: FMain.class:345
msgid "No"
msgstr ""
-#: FMain.class:341
+#: FMain.class:362
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:345
+#: FMain.class:366
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:358
+#: FMain.class:379
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:358
+#: FMain.class:379
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:509
+#: FMain.class:531
msgid "Process Overview"
msgstr ""
-#: FMain.class:529
+#: FMain.class:551
msgid "Next"
msgstr ""
-#: FMain.class:535
+#: FMain.class:557
msgid "Back"
msgstr ""
-#: FMain.class:541
+#: FMain.class:563
msgid "Exit Installation"
msgstr ""
-#: FMain.class:557
+#: FMain.class:579
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmDiskPart.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartScheme.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartSel.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPkgSel.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSelISO.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSummary.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmWinDrives.class
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlCore.module
+# /home/vluser/devel/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:182
+#: MdlCore.module:204
msgid "Scanning system for installable media. Please wait ..."
msgstr ""
-#: MdlCore.module:198
+#: MdlCore.module:220
msgid "No Installable Media Found"
msgstr ""
-#: MdlCore.module:200
+#: MdlCore.module:222
msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
msgstr ""
-#: MdlCore.module:200
+#: MdlCore.module:222
msgid "installation CD and click "
msgstr ""
-#: MdlCore.module:200
+#: MdlCore.module:222
msgid "to try again"
msgstr ""
-#: MdlCore.module:361
+#: MdlCore.module:383
msgid "Build Date: "
msgstr ""
-#: MdlCore.module:361
+#: MdlCore.module:383
msgid "MINIMUM REQUIREMENTS"
msgstr ""
-#: MdlCore.module:366
+#: MdlCore.module:388
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:439
+#: MdlCore.module:461
msgid "Cannot find SETUP.CONF"
msgstr ""
-#: MdlCore.module:447
+#: MdlCore.module:469
msgid "Preparation"
msgstr ""
-#: MdlCore.module:448
+#: MdlCore.module:470
msgid "Language Selection"
msgstr ""
-#: MdlCore.module:449
+#: MdlCore.module:471
msgid "Find installation media"
msgstr ""
-#: MdlCore.module:450
+#: MdlCore.module:472
msgid "Disk Partitioning"
msgstr ""
-#: MdlCore.module:451
+#: MdlCore.module:473
msgid "Software Selection"
msgstr ""
-#: MdlCore.module:453
+#: MdlCore.module:475
msgid "Installation"
msgstr ""
-#: MdlCore.module:454
+#: MdlCore.module:476
msgid "Installation Summary"
msgstr ""
-#: MdlCore.module:456
+#: MdlCore.module:478
msgid "Install Operating System"
msgstr ""
-#: MdlCore.module:457
+#: MdlCore.module:479
msgid "System Configuration"
msgstr ""
-#: MdlCore.module:458
+#: MdlCore.module:480
msgid "Boot Menu Options"
msgstr ""
-#: MdlCore.module:459
+#: MdlCore.module:481
msgid "Regional Settings"
msgstr ""
-#: MdlCore.module:460
+#: MdlCore.module:482
msgid "System Administrator"
msgstr ""
-#: MdlCore.module:461
+#: MdlCore.module:483
msgid "User Accounts"
msgstr ""
-#: MdlCore.module:462
+#: MdlCore.module:484
msgid "Network Configuration"
msgstr ""
-#: MdlCore.module:463
+#: MdlCore.module:485
msgid "Final Hardware Configuration"
msgstr ""
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlDiskPart.module
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlObjSizer.module
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPartSel.module
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPkgSel.module
+# /home/vluser/devel/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 Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Fri Nov 7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Nov 7 07:12:36 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.127
+Version=0.0.141
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Fri Nov 7 07:12:36 2008
@@ -46,6 +46,14 @@
'ClsGlobal.sSourceMnt = "/mnt" &/ "source" 'FOR TESTING ONLY
'/ THE FOLLOWING LINES HAVE BEEN COMMENTED FOR TESTING ONLY
'IF frmInit = "" OR IsNull(frmInit) THEN frmInit = FrmSelISO
+
+IF Application.Args[1] = "-C" THEN
+frmInit = FrmPartSel
+FMain.btnext.Enabled = TRUE
+FMain.btnext.ForeColor = Color.Black
+END IF
+
+
IF NOT frmInit THEN frmInit = FrmLangSel
frmInit.Reparent(ME.pnlwinhost)
frmInit.width = pnlwinhost.Width
@@ -85,7 +93,7 @@
UNTIL FMain.tvPlan.MoveBelow()
'Message(iWidth)
FMain.btnext.Enabled = FALSE ' disable the button until a language is
selected
-
+IF ERROR THEN Message(Error.Text & "<br>" & Error.Where)
END
PUBLIC SUB AUTOSIZE_LEFT_PANE()
@@ -186,6 +194,19 @@
END IF
+ IF Application.Args[1] = "-C" THEN
+ ' navigation for configuration
+ SELECT CASE FrmCurr.Name
+ CASE "FrmPartSel"
+ frmNext = FrmLilo
+ END SELECT
+
+ 'FrmCurr.Hide
+ frmNext.Reparent(FrmCurr.Parent)
+ frmNext.Show
+
+
+ ELSE
SELECT CASE FrmCurr.Name ' very nice navigation algoritm
@@ -403,6 +424,7 @@
MdlSetup.BEGIN_INSTALLATION()
END IF
+ END IF
END IF
tvPlan.Refresh()
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Fri Nov 7 07:12:36 2008
@@ -36,6 +36,7 @@
ME.tlList.Adjust
ME.TabStrip1.Index = MdlLiloOsList.iVltag
MdlLiloOsList.bVlCliOption = TRUE
+
' ' '
'
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Fri Nov 7 07:12:36 2008
@@ -126,6 +126,14 @@
WITH FrmLilo.LiloTarget
'IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
+ 'IF Application.Args[1] <> "" THEN
+
+ ' DETECT THE FILESYSTEM OF THE PARTITION BEING MOUNTED AS
ROOT HERE
+
+
+
+ ' ELSE
+
FOR EACH cb IN MdlPartSel.oMountPoints
IF cb.text = "/" THEN
ClsPartSel.sRoot = cb.Tag ' make sure this is set... we
will need it later
@@ -136,6 +144,9 @@
NEXT
END IF
NEXT
+
+
+ 'END IF
'.Add("Sector")
' END IF
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Fri Nov 7 07:12:36 2008
@@ -151,12 +151,34 @@
PUBLIC SUB main()
' ' '
+IF Application.Args[1] = "-C" THEN
+ ' try to configure
+ 'EXEC ["mount", Application.Args[1], "/mnt/target"] WAIT
+ME.display_config_stage
+ ELSE
FMain.Show
+ END IF
END
+
+PUBLIC SUB display_config_stage()
+
+ FrmPartSel.Reparent(fmain.pnlwinhost)
+ fmain.frmInit = FrmPartSel
+ fmain.Show
+ fmain.btnext.Enabled = TRUE
+ fmain.btnext.ForeColor = Color.Black
+ 'ME.PREPARE_INSTALL_LAYOUT
+ 'FrmLilo.Show
+ IF ERROR THEN Message(Error.where & "\n" & Error.Text)
+END
+
+
+
+
PUBLIC SUB TRANSLATE_HOST_WINDOW()
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Fri Nov 7 07:12:36 2008
@@ -370,6 +370,8 @@
' Add an option to boot the recently installed OS to CLI mode
'ClsPartSel.sRoot = "/dev/sdb" ' for testing only
'IF sLiloDesc LIKE "Vector" THEN
+ 'IF Application.Args[1] = "" THEN
+
FOR EACH cb IN MdlPartSel.oMountPoints
IF cb.text = "/" AND cb.tag = arrLinux[i] THEN
'IF arrLinux[i] = ClsPartSel.sRoot THEN
@@ -387,6 +389,15 @@
ME.iVlTag = FrmLilo.TabStrip1.Index - 1
END IF
NEXT
+
+ 'ELSE
+ ' DETECT THE FILESYSTEM ON THE ROOT PARTITION HERE
+
+
+ 'END IF
+
+
+
'END IF
END WITH ' end jacking with the tabstrip itself
END IF
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
