Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r283 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-11 19:57:45
|
Author: M0E.lnx
Date: Tue Nov 11 11:57:03 2008
New Revision: 283
Added:
branches/iVL/ClsInstall.class
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/FMain.class
branches/iVL/FrmDiskPart.form
branches/iVL/FrmLangSel.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmPartSel.form
branches/iVL/FrmSelISO.class
branches/iVL/MdlNav.module
Log:
Incomplete navigation
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Nov 11 11:57:03 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /home/remote/devel/installer/.project
# 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 Tue Nov 11 11:57:03 2008
@@ -14,91 +14,91 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:191
+#: FMain.class:219
msgid "Restart"
msgstr ""
-#: FMain.class:240
+#: FMain.class:267
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:242
+#: FMain.class:269
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:242
+#: FMain.class:269
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:256
+#: FMain.class:283
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:313
+#: FMain.class:340
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:314
+#: FMain.class:341
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:325
+#: FMain.class:352
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:339
+#: FMain.class:366
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "Yes"
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "No"
msgstr ""
-#: FMain.class:372
+#: FMain.class:399
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:376
+#: FMain.class:403
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:389
+#: FMain.class:416
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:389
+#: FMain.class:416
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:640
+#: FMain.class:667
msgid "Back"
msgstr ""
-#: FMain.class:652
+#: FMain.class:679
msgid "Exit Installation"
msgstr ""
-#: FMain.class:664
+#: FMain.class:691
msgid "Next"
msgstr ""
-#: FMain.class:678
+#: FMain.class:705
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Nov 11 11:57:03 2008
@@ -14,39 +14,39 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartScheme.class:61
+#: FrmPartScheme.class:64
msgid "Select this option if you already have a linux installation that
you wish to overwrite or if a linux partition scheme exists in your hard
disk."
msgstr ""
-#: FrmPartScheme.class:61
+#: FrmPartScheme.class:64
msgid "This option will overwrite any existing data in the selected
partitions"
msgstr ""
-#: FrmPartScheme.class:61
+#: FrmPartScheme.class:64
msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
msgstr ""
-#: FrmPartScheme.class:70
+#: FrmPartScheme.class:74
msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
msgstr ""
-#: FrmPartScheme.class:70
+#: FrmPartScheme.class:74
msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
msgstr ""
-#: FrmPartScheme.class:112
+#: FrmPartScheme.class:117
msgid "Disk Partitioning Options"
msgstr ""
-#: FrmPartScheme.class:117
+#: FrmPartScheme.class:122
msgid "Use existing disk partitions"
msgstr ""
-#: FrmPartScheme.class:122
+#: FrmPartScheme.class:127
msgid "Modify my disk partitions to make room for new installation"
msgstr ""
-#: FrmPartScheme.class:127
+#: FrmPartScheme.class:132
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Tue Nov 11 11:57:03 2008
@@ -14,75 +14,75 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "user data separately for added data security. You may install the
system to a single partition"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "suggested setup for a typical Linux installation"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Used to store system data. This particular install requires a
minimum of"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "for this"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "but you should considear a higher value to make sure you have room
to install additional software"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "in case you wish to."
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Typically, you want to use the largest partition for this."
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "for this is"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "but can also be calculated as 2 times your ammount of RAM"
msgstr ""
-#: FrmPartSel.class:180
+#: FrmPartSel.class:182
msgid "Please select the partitions you wish to use and how to use them"
msgstr ""
-#: FrmPartSel.class:185
+#: FrmPartSel.class:187
msgid "Help"
msgstr ""
-#: FrmPartSel.class:205
+#: FrmPartSel.class:207
msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
msgstr ""
-#: FrmPartSel.class:206
+#: FrmPartSel.class:208
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Nov 11 11:57:03 2008
@@ -18,43 +18,43 @@
msgid "No Installable Media Found"
msgstr ""
-#: FrmSelISO.class:74
+#: FrmSelISO.class:79
msgid "Click"
msgstr ""
-#: FrmSelISO.class:74
+#: FrmSelISO.class:79
msgid "to begin installating"
msgstr ""
-#: FrmSelISO.class:76
+#: FrmSelISO.class:81
msgid "Unable to locate any installable media."
msgstr ""
-#: FrmSelISO.class:82
+#: FrmSelISO.class:87
msgid "Select installation media from the list below"
msgstr ""
-#: FrmSelISO.class:113
+#: FrmSelISO.class:118
msgid "Unable to identify distro."
msgstr ""
-#: FrmSelISO.class:148
+#: FrmSelISO.class:153
msgid "Minimum Disk Space Requirements"
msgstr ""
-#: FrmSelISO.class:251
+#: FrmSelISO.class:256
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:257
+#: FrmSelISO.class:262
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:262
+#: FrmSelISO.class:267
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:267
+#: FrmSelISO.class:272
msgid "Search Again"
msgstr ""
Added: branches/iVL/ClsInstall.class
==============================================================================
--- (empty file)
+++ branches/iVL/ClsInstall.class Tue Nov 11 11:57:03 2008
@@ -0,0 +1,23 @@
+' 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 sDev AS String
+STATIC PUBLIC sISOname AS String
+STATIC PUBLIC sLANG AS String
+
+' Partition method
+STATIC PUBLIC bUseGparted AS Boolean
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 11 11:57:03 2008
@@ -179,9 +179,37 @@
END
+PUBLIC SUB btnext_Click()
+ DIM frmLast AS Form
+
+ 'Message(pnlwinhost.Children.Type)
+ 'frmTemp = FrmCurr
+' FrmCurr.Close
+'frmlast = FrmCurr
+ IF FrmCurr.name = "FrmLangSel" THEN
+ ME.Button1_Click()
+ RETURN
+ ELSE
+ 'END IF
+ 'FrmCurr = pnlwinhost.
+'ME.pnlwinhost.Children.Clear
+frmNext = MdlNav.Forward(FrmCurr.Name) '.Reparent(ME.pnlwinhost)
+FrmCurr.Close
+frmNext.Reparent(ME.pnlwinhost)
+ 'frmlast.Hide
+ 'MdlNav.Forward(FrmCurr.Name).Show()
+ 'frmlast.Close
+ 'frmlast.Close
+END IF
+ 'MdlNav.Forward(FrmCurr.Text).Reparent(ME.pnlwinhost)
+ 'MdlNav.Forward(FrmCurr.Text).Show
+
+
+END
-PUBLIC SUB btnext_Click()
+
+PUBLIC SUB btnext_Click_old()
DIM sISONAME AS String
DIM sDev AS String
DIM sLang AS String
@@ -228,8 +256,7 @@
MdlSetup.GO_WITH_SELECTED(sDev, "")
END IF
frmNext = FrmPartScheme
-
-
+
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.form
==============================================================================
--- branches/iVL/FrmDiskPart.form (original)
+++ branches/iVL/FrmDiskPart.form Tue Nov 11 11:57:03 2008
@@ -12,7 +12,7 @@
MoveScaled(1,12,74,48)
Expand = True
{ EmbGPARTED Embedder
- MoveScaled(6,7,76,32)
+ MoveScaled(1,4,76,32)
Expand = True
}
}
Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class (original)
+++ branches/iVL/FrmLangSel.class Tue Nov 11 11:57:03 2008
@@ -80,6 +80,8 @@
PUBLIC SUB lbLangSel_Select()
FMain.btnext.Enabled = TRUE
+ ClsInstall.sLANG = LAST.current.Key
+ System.Language = ClsInstall.sLANG
'Message(LAST.current.key)
END
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Tue Nov 11 11:57:03 2008
@@ -36,6 +36,9 @@
PUBLIC SUB Form_Open()
+
+ MdlSetup.GO_WITH_SELECTED(ClsInstall.sDev, ClsInstall.sISOname)
+
ME.tlBanner.text = "<h3>" & ME.tlBanner.text & "</h3>"
FMain.FrmCurr = ME
FMain.tvPlan["Prep2"].Selected = TRUE
@@ -59,7 +62,8 @@
("Select this option if you already have a linux installation that you
wish to overwrite or if a linux partition scheme exists in your hard
disk.") & Space(1)&
"<b>" & ("This option will overwrite any existing data in the selected
partitions") & "</b><br><br>" &
"<i>" & ("Use this option if you already prepared your partitions using
the VectorLinux installer") & "</i> "
- FMain.frmNext = FrmPartSel
+ ClsInstall.bUseGparted = FALSE
+ 'FMain.frmNext = FrmPartSel
END
@@ -68,7 +72,8 @@
ME.tlChoiceExp.Text = "<h3>" & rbEditPartitions.Text & "</h3><br>" &
("Select this option is you wish to create, more or resize partitions in
order to make room for your new VectorLinux installation.") & Space(1)&
("This option is the safest choice if you have other existing
installations that you wish to keep.")
- FMain.frmNext = FrmDiskPart
+ ClsInstall.bUseGparted = TRUE
+ 'FMain.frmNext = FrmDiskPart
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Tue Nov 11 11:57:03 2008
@@ -59,14 +59,14 @@
ME.Resize(ME.Parent.Width, ME.Parent.Height - (ME.cbDoWin.height * 3))
ME.tlBanner.Adjust
ME.cbDoWin.Width = MdlObjSizer.get_object_width(cbDoWin.text) + 24
- MdlPartSel.DISPLAY_PARTITION_OPTIONS
+
ME.cbDoWin.Value = FALSE
ClsPartSel.bDoWin = FALSE
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
FMain.tvPlan["Prep2"].Selected = TRUE
FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
-
+MdlPartSel.DISPLAY_PARTITION_OPTIONS
END
PUBLIC SUB Form_Hide()
@@ -116,7 +116,9 @@
PUBLIC SUB cbDoWin_Click()
- ClsPartSel.bDoWin = cbDoWin.Value
+ 'ClsPartSel.bDoWin = cbDoWin.Value
+ IF LAST.value = TRUE THEN ClsPartSel.bDoWin = TRUE
+ IF LAST.value = FALSE OR IF LAST.value = NULL THEN ClsPartSel.bDoWin =
FALSE
' ' IF ClsPartSel.bDoWin = TRUE THEN
' ' FMain.frmNext = FrmWinDrives
' ' ELSE
Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form (original)
+++ branches/iVL/FrmPartSel.form Tue Nov 11 11:57:03 2008
@@ -16,7 +16,7 @@
Picture = Picture["icon:/small/help"]
}
{ hrSep Separator
- MoveScaled(2,6,19,1)
+ MoveScaled(5,4,19,1)
}
}
{ scrollPartitions ScrollView
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Tue Nov 11 11:57:03 2008
@@ -30,10 +30,14 @@
IF lstInstallableImg.Find(("No Installable Media Found")) = -1
IF InStr(Trim(lstInstallableImg.Text), ".iso") OR
InStr(Trim(lstInstallableImg.Text), ".ISO") = TRUE THEN
sLocation = Left(lstInstallableImg.Text,
InStr(lstInstallableImg.Text, " ") - 1)
-
+ ClsInstall.sISOname = sLocation
+ ClsInstall.sDev = Trim(Right(lstInstallableImg.Text,
Len(lstInstallableImg.Text) - InStr(lstInstallableImg.Text, "/")))
+
ELSE
ipos1 = RInStr(ME.lstInstallableImg.Text, "/")
sLocation = Right(ME.lstInstallableImg.Text,
Len(ME.lstInstallableImg.Text) - ipos1)
+ ClsInstall.sDev = sLocation
+ ClsInstall.sISOname = ""
END IF
'function to read the file
ME.DESCRIBE_DISTRO(sLocation)
@@ -44,6 +48,7 @@
'Message(Left(FrmSelISO.lstInstallableImg.text,
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4))
+'ClsInstall.sDev = sLocation
END
Modified: branches/iVL/MdlNav.module
==============================================================================
--- branches/iVL/MdlNav.module (original)
+++ branches/iVL/MdlNav.module Tue Nov 11 11:57:03 2008
@@ -17,9 +17,38 @@
PUBLIC FUNCTION Forward(sTrFCurrent AS String) AS Form
DIM fRet AS Form
+ DIM sISONAME, sDev, sLang AS String
+
SELECT CASE sTrFCurrent
+
CASE "FrmSelISO"
fRet = FrmPartScheme
+ CASE "FrmPartScheme"
+ IF ClsInstall.bUseGparted = TRUE THEN
+ Fret = FrmDiskPart
+ ELSE
+ fRet = FrmPartSel
+ END IF
+ CASE "FrmPartsel"
+ IF NOT ClsPartSel.sRoot OR ClsPartSel.sRoot = "" THEN
+ Message.Error(("You must select a \"/\" partition. This is the
target where the system will install to"))
+ RETURN
+ END IF
+ MdlPartSel.SET_LINUX_PARTITION_TYPES()
+ IF ClsPartSel.bDoWin = TRUE THEN
+ fRet = FrmWinDrives
+ ELSE
+ fRet = FrmPkgSel
+ END IF
+ CASE "FrmDiskPart"
+ 'IF MdlSetup.CHECK_IF_REBOOT_NEEDED() = TRUE THEN
+ ' now need to reboot
+ fRet = FrmPartSel
+ 'case
+
+' END IF
+
+
END SELECT
RETURN fRet
|
