Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r68 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-07-23 02:24:47
|
Author: M0...@gm...
Date: Tue Jul 22 19:23:28 2008
New Revision: 68
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/FMain.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/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FMain.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmPkgsel2.class
branches/iVL/FrmPkgsel2.form
branches/iVL/FrmSelISO.class
branches/iVL/FrmSummary.class
branches/iVL/MdlSummarize.module
Log:
Small cosmetic changes. Fixed problem with hidden navigation buttons
and touched up reverse navigation
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/vluser/area-51/projects/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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /home/vluser/area-51/projects/installer/ClsPartSel.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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/vluser/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:238
+#: FMain.class:244
msgid "Process Overview"
msgstr ""
-#: FMain.class:252
+#: FMain.class:258
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:263
+#: FMain.class:269
msgid "Next"
msgstr ""
-#: FMain.class:269
+#: FMain.class:275
msgid "Back"
msgstr ""
-#: FMain.class:275
+#: FMain.class:281
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/vluser/area-51/projects/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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPkgSel.class
+# /home/vluser/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPkgSel.class:96
+#: FrmPkgSel.class:98
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:102
+#: FrmPkgSel.class:104
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:107
+#: FrmPkgSel.class:109
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/area-51/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSelISO.class:224
+#: FrmSelISO.class:228
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:230
+#: FrmSelISO.class:234
msgid "Select which distribution to install from the list below"
msgstr ""
-#: FrmSelISO.class:235
+#: FrmSelISO.class:239
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:240
+#: FrmSelISO.class:244
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSummary.class
+# /home/vluser/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSummary.class:73
+#: FrmSummary.class:80
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /home/vluser/area-51/projects/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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/vluser/area-51/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/area-51/projects/installer/MdlDiskPart.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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPkgSel.module
+# /home/vluser/area-51/projects/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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSummarize.module
+# /home/vluser/area-51/projects/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 Tue Jul 22 19:23:28 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /home/vluser/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Jul 22 19:23:28 2008
@@ -44,12 +44,16 @@
FrmSelISO.Show
MdlCore.PREPARE_INSTALL_LAYOUT
+
WITH ME
.btback.Enabled = FALSE
.btback.ForeColor = Color.Gray
.Frame1.BackColor = Color.Transparent
.tvPlan.BackColor = Color.transparent
.btQuit.Text = "Exit Installation"
+ .tvPlan["Prep0"].Selected = TRUE
+ .tvPlan["Prep0"].Picture = MdlCore.sNowPic
+
END WITH
'ME.TreeView1.BackColor = Color.Transparent
ME.AUTOSIZE_LEFT_PANE
@@ -98,7 +102,7 @@
.tvPlan.Move(4, 24, .Frame1.Width - 8, .Frame1.Height - 28) ' THIS
WILL LEAVE 16PIX ON TOP AND BOTTOM AND 2 ON LEFT AND RIGHT
'.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
- .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 2)))
+ .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 3.5)))
.btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
@@ -192,8 +196,10 @@
'IF ClsGlobal.sBackNav.Find(FrmCurr) = -1 THEN
' ClsGlobal.sBackNav.Add(FrmCurr)
'END IF
+ IF FrmCurr.Name <> "FrmDiskPart" THEN
IF ClsGlobal.sBackNav.Find(frmNext) = -1 THEN
ClsGlobal.sBackNav.Add(frmNext)
+ END IF
END IF
frmNext.Show
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Tue Jul 22 19:23:28 2008
@@ -75,7 +75,7 @@
PUBLIC SUB Form_Hide()
-
+FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Tue Jul 22 19:23:28 2008
@@ -63,13 +63,13 @@
ClsPartSel.bDoWin = FALSE
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
-
+ FMain.tvPlan["Prep1"].Selected = TRUE
+ FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic
END
PUBLIC SUB Form_Hide()
-
-
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
END
PUBLIC FUNCTION ANALYZE_PARTITION_SETUP() AS Integer
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Tue Jul 22 19:23:28 2008
@@ -65,8 +65,10 @@
PUBLIC SUB Form_Hide()
+ IF ClsPkgSel.bCustom = FALSE THEN
-
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
+ END IF
END
PUBLIC SUB Form_Show()
Modified: branches/iVL/FrmPkgsel2.class
==============================================================================
--- branches/iVL/FrmPkgsel2.class (original)
+++ branches/iVL/FrmPkgsel2.class Tue Jul 22 19:23:28 2008
@@ -26,6 +26,8 @@
END WITH
FMain.FrmCurr = ME
FMain.btback.Enabled = TRUE
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Prep2"].Selected = TRUE
FMain.btback.ForeColor = Color.Black
MdlPkgSel.LIST_PACKAGE_SELECTION()
END
@@ -57,5 +59,11 @@
PUBLIC SUB scrPkgs_MouseDown()
+
+END
+
+PUBLIC SUB Form_Hide()
+
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
END
Modified: branches/iVL/FrmPkgsel2.form
==============================================================================
--- branches/iVL/FrmPkgsel2.form (original)
+++ branches/iVL/FrmPkgsel2.form Tue Jul 22 19:23:28 2008
@@ -8,7 +8,7 @@
Text = ("TextLabel1")
}
{ scrPkgs ScrollView
- MoveScaled(0,8,50,22)
+ MoveScaled(1,8,50,22)
Expand = True
}
}
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Tue Jul 22 19:23:28 2008
@@ -54,6 +54,8 @@
FMain.sNextKey = "Prep0"
FMain.FrmCurr = ME
FMain.frmNext = FrmPartScheme
+' FMain.tvPlan["Prep0"].Selected = TRUE
+ ' FMain.tvPlan["Prep0"].Picture = MdlCore.sNowPic
IF ClsGlobal.sBackNav.Find(ME) = -1 THEN
ClsGlobal.sBackNav.Add(ME)
END IF
@@ -193,6 +195,8 @@
PUBLIC SUB Form_Hide()
FMain.frmLast = ME
+ FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
+
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Tue Jul 22 19:23:28 2008
@@ -50,5 +50,12 @@
PUBLIC SUB Form_Show()
Form_Open()
+
+
+END
+
+PUBLIC SUB Form_Hide()
+
+ FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
END
Modified: branches/iVL/MdlSummarize.module
==============================================================================
--- branches/iVL/MdlSummarize.module (original)
+++ branches/iVL/MdlSummarize.module Tue Jul 22 19:23:28 2008
@@ -86,7 +86,7 @@
sLine = ClsWinDrives.sWinDrives[i]
spart = Trim(Left(sLine, InStr(sLine, "|") - 1))
sMntPnt = Right(sLine, Len(sLine) - InStr(sLine, "|"))
- sRet = sRet & gb.NewLine & spart & " will be mounted to " & sMntPnt
+ sRet = sRet & "<br>" & spart & " will be mounted to " & sMntPnt
'Message.Info(sLine)
NEXT
sRet = Trim(sRet)
|
