Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r359 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-04 16:03:00
|
Author: M0...@gm...
Date: Thu Dec 4 08:01:25 2008
New Revision: 359
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmSummary.class
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartSel.module
branches/iVL/installer.gambas
Log:
- 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.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 08:01:25 2008
@@ -102,19 +102,19 @@
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:815
+#: FMain.class:816
msgid "Back"
msgstr ""
-#: FMain.class:826
+#: FMain.class:827
msgid "Exit Installation"
msgstr ""
-#: FMain.class:837
+#: FMain.class:838
msgid "Next"
msgstr ""
-#: FMain.class:851
+#: FMain.class:852
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Dec 4 08:01:25 2008
@@ -54,47 +54,47 @@
msgid "Not Used"
msgstr ""
-#: FrmSummary.class:75
+#: FrmSummary.class:71
msgid "Do not format"
msgstr ""
-#: FrmSummary.class:76
+#: FrmSummary.class:72
msgid "No"
msgstr ""
-#: FrmSummary.class:78
+#: FrmSummary.class:74
msgid "Yes"
msgstr ""
-#: FrmSummary.class:104
+#: FrmSummary.class:100
msgid "None"
msgstr ""
-#: FrmSummary.class:126
+#: FrmSummary.class:123
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:179
+#: FrmSummary.class:177
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:188
+#: FrmSummary.class:186
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:215
+#: FrmSummary.class:213
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:291
+#: FrmSummary.class:289
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:301
+#: FrmSummary.class:299
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:311
+#: FrmSummary.class:309
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Dec 4 08:01:25 2008
@@ -30,15 +30,15 @@
msgid "Do not format"
msgstr ""
-#: MdlPartSel.module:143
+#: MdlPartSel.module:148
msgid "Not Used"
msgstr ""
-#: MdlPartSel.module:289
+#: MdlPartSel.module:294
msgid "Please select only one "
msgstr ""
-#: MdlPartSel.module:289
+#: MdlPartSel.module:294
msgid "partition"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 08:01:25 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.37
+Version=0.1.38
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Thu Dec 4 08:01:25 2008
@@ -1,5 +1,4 @@
-- Fixed typo in gparted module
-- Fixed issue with user icon now showing up after first user account.
-- Added auto-modifying of -cli lilo entry if the chosen label is too long.
Added warning to user interface to warn accordingly
-- Relabeled "Sector" to "Bootsector of" in LIlo setup
-- Fine tuned lilo target options in the search for a floppy drive
+- 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.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 08:01:25 2008
@@ -686,6 +686,7 @@
'Message(System.Language)
MdlCore.frmInit = FrmSelISO
MdlCore.main
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Thu Dec 4 08:01:25 2008
@@ -55,11 +55,7 @@
sMountPnt = cb.Text
FOR EACH cb1 IN MdlPartSel.oFsTypes
IF cb1.tag = cb.tag THEN sFsType = cb1.Text
- ' IF cb1.Text = ("Do not format") THEN
- ' bForm = ("No")
- ' ELSE
- ' bForm = ("Yes")
- ' END IF
+
NEXT
FOR EACH tl IN MdlPartSel.oPartLbls
IF tl.tag = cb.tag THEN
@@ -111,6 +107,7 @@
.GridView1[irow, 2].BackColor = Color.LightBackground
.GridView1[irow, 3].Text = sMountPnt
.GridView1[irow, 3].BackColor = Color.LightBackground
+ .GridView1[irow, 4].BackColor = Color.LightBackground
END WITH
INC irow
'INC GridView1.Rows.Count
@@ -150,6 +147,7 @@
.GridView1[irow, 2].text = sFsType
.GridView1[irow, 3].text = sMountPnt
.GridView1[irow, 3].BackColor = Color.LightGray
+ .GridView1[irow, 4].Text = ("No")
END WITH
INC irow
END IF
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Dec 4 08:01:25 2008
@@ -289,9 +289,14 @@
PUBLIC SUB ACTIVATE_SWAP_SPACE()
DIM cb AS ComboBox
+ DIM sDump AS String
FOR EACH cb IN MdlPartSel.oSwaps
- SHELL "echo \'" & cb.Tag & " none swap sw 0 0 \' >> /etc/fstab" WAIT
+ EXEC ["grep", cb.Tag, "/etc/fstab"] TO sDump
+ sDump = Trim(sDump)
+ IF Len(sDump) = 0 THEN
+ SHELL "echo \'" & cb.Tag & " none swap sw 0 0 \' >>
/etc/fstab" WAIT
+ END IF
NEXT
SHELL "swapon -a" WAIT
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Thu Dec 4 08:01:25 2008
@@ -140,6 +140,11 @@
.Height = tl.Height
.Width = MdlObjSizer.get_object_width(("Do not format")) *
1.5 'tl.Width"
.ReadOnly = TRUE
+ ' Allow the user to only mount this partition at boot
time if it is the host of an ISO
+ IF InStr(FrmSelISO.lstInstallableImg.Text, .Tag) THEN
+ .Add("/mnt" &/ Right(.Tag, Len(.Tag) -
RInStr(.Tag, "/")))
+
+ ELSE
.Add(("Not Used"))
.Add("/")
.Add("/home")
@@ -149,10 +154,10 @@
.Add("/tmp")
.Add("/mnt" &/ Right(.tag, Len(.tag) -
RInStr(.tag, "/"))) ' Add option to mount linux partitions to /mnt/xdx
.Add("Swap")
- IF InStr(FrmSelISO.lstInstallableImg.Text, .tag) THEN
- .Enabled = FALSE
- ELSE
- .Enabled = TRUE
+ 'IF InStr(FrmSelISO.lstInstallableImg.Text, .tag) THEN
+ ' .Enabled = FALSE
+ 'ELSE
+ ' .Enabled = TRUE
END IF
END WITH
oMountPoints.Add(cb)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
