From: <cod...@go...> - 2008-09-26 20:16:34
|
Author: m0e.lnx Date: Fri Sep 26 13:15:26 2008 New Revision: 186 Modified: branches/iVL/.lang/FMain.pot branches/iVL/.lang/FrmPartScheme.pot branches/iVL/.lang/FrmSelISO.pot branches/iVL/FMain.class branches/iVL/FrmInstallSys.class branches/iVL/FrmLangSel.class branches/iVL/FrmPartScheme.class branches/iVL/FrmPartSel.class branches/iVL/FrmPkgSel.class branches/iVL/FrmPkgsel2.class branches/iVL/FrmSelISO.class branches/iVL/FrmSummary.class Log: - Updated navigation status indicator to match new steps Modified: branches/iVL/.lang/FMain.pot ============================================================================== --- branches/iVL/.lang/FMain.pot (original) +++ branches/iVL/.lang/FMain.pot Fri Sep 26 13:15:26 2008 @@ -14,39 +14,39 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain.class:231 +#: FMain.class:214 msgid "Please wait while setup attampts to run the partitioning utility" msgstr "" -#: FMain.class:233 +#: FMain.class:216 msgid "Please wait while setup analyses your current partition setup." msgstr "" -#: FMain.class:233 +#: FMain.class:216 msgid "This may take a while ..." msgstr "" -#: FMain.class:247 +#: FMain.class:230 msgid "You must select a \"/\" partition. This is the target where the system will install to" msgstr "" -#: FMain.class:405 +#: FMain.class:388 msgid "Process Overview" msgstr "" -#: FMain.class:425 +#: FMain.class:408 msgid "Next" msgstr "" -#: FMain.class:431 +#: FMain.class:414 msgid "Back" msgstr "" -#: FMain.class:437 +#: FMain.class:420 msgid "Exit Installation" msgstr "" -#: FMain.class:453 +#: FMain.class:436 msgid "Button1" msgstr "" Modified: branches/iVL/.lang/FrmPartScheme.pot ============================================================================== --- branches/iVL/.lang/FrmPartScheme.pot (original) +++ branches/iVL/.lang/FrmPartScheme.pot Fri Sep 26 13:15:26 2008 @@ -14,31 +14,31 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FrmPartScheme.class:55 +#: FrmPartScheme.class:56 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:55 +#: FrmPartScheme.class:56 msgid "This option will overwrite any existing data in the selected partitions" msgstr "" -#: FrmPartScheme.class:55 +#: FrmPartScheme.class:56 msgid "Use this option if you already prepared your partitions using the VectorLinux installer" msgstr "" -#: FrmPartScheme.class:105 +#: FrmPartScheme.class:106 msgid "Select your disk partition option" msgstr "" -#: FrmPartScheme.class:110 +#: FrmPartScheme.class:111 msgid "Use existing disk partitions" msgstr "" -#: FrmPartScheme.class:115 +#: FrmPartScheme.class:116 msgid "Modify my disk partitions to make room for new installation" msgstr "" -#: FrmPartScheme.class:120 +#: FrmPartScheme.class:121 msgid "TextLabel1" msgstr "" Modified: branches/iVL/.lang/FrmSelISO.pot ============================================================================== --- branches/iVL/.lang/FrmSelISO.pot (original) +++ branches/iVL/.lang/FrmSelISO.pot Fri Sep 26 13:15:26 2008 @@ -18,11 +18,11 @@ msgid "No Installable Media Found" msgstr "" -#: FrmSelISO.class:73 +#: FrmSelISO.class:71 msgid "Click" msgstr "" -#: FrmSelISO.class:73 +#: FrmSelISO.class:71 msgid "to begin installating " msgstr "" Modified: branches/iVL/FMain.class ============================================================================== --- branches/iVL/FMain.class (original) +++ branches/iVL/FMain.class Fri Sep 26 13:15:26 2008 @@ -48,9 +48,7 @@ frmInit.width = pnlwinhost.Width frmInit.height = pnlwinhost.Height -' FrmSelISO.Reparent(ME.pnlWinHost) -' FrmSelISO.Width = pnlWinHost.Width -' FrmSelISO.Height = pnlWinHost.Height + iImg = Image.Load("images/installer.png").Stretch(400, 50) 'iImg.Resize(600, 80) @@ -60,9 +58,6 @@ PictureBox1.Stretch = TRUE MdlCore.PREPARE_INSTALL_LAYOUT -'FrmSelISO.Show -'FrmSelISO.Hide - 'STOP EVENT ME.Width = 800 @@ -75,21 +70,9 @@ .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 .tlBanner.Height = .PictureBox1.Height END WITH -'ME.TreeView1.BackColor = Color.Transparent -''ME.AUTOSIZE_LEFT_PANE() -' ' ' / THE FOLLOWING LINES HAVE BEEN IMPLEMENTED FOR TESTING PURPOSES -' ' ' WITH FrmLilo -' ' ' .Reparent(Fmain.pnlWinHost) -' ' ' .Width = Fmain.pnlWinHost.Width -' ' ' .Height = Fmain.pnlWinHost.Height -' ' ' .Show -' ' ' END WITH Modified: branches/iVL/FrmInstallSys.class ============================================================================== --- branches/iVL/FrmInstallSys.class (original) +++ branches/iVL/FrmInstallSys.class Fri Sep 26 13:15:26 2008 @@ -23,9 +23,9 @@ MdlCore.lock_gui() FMain.FrmCurr = ME - FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic - FMain.tvPlan["Inst2"].Picture = MdlCore.sNowPic - FMain.tvPlan["Inst2"].Selected = TRUE + FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic + FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic + FMain.tvPlan["Inst1"].Selected = TRUE MdlInstallSys.ACTIVATE_SWAP_SPACE() ' activate swap for the current install Modified: branches/iVL/FrmLangSel.class ============================================================================== --- branches/iVL/FrmLangSel.class (original) +++ branches/iVL/FrmLangSel.class Fri Sep 26 13:15:26 2008 @@ -19,6 +19,8 @@ PUBLIC SUB Form_Open() + FMain.tvPlan["Prep0"].Selected = TRUE + FMain.FrmCurr = ME tlbanner.text = "<h3>" & tlbanner.text & "</h3>" ME.LIST_LANG_CHOICES() Modified: branches/iVL/FrmPartScheme.class ============================================================================== --- branches/iVL/FrmPartScheme.class (original) +++ branches/iVL/FrmPartScheme.class Fri Sep 26 13:15:26 2008 @@ -33,9 +33,10 @@ PUBLIC SUB Form_Open() FMain.FrmCurr = ME -FMain.tvPlan["Prep1"].Selected = TRUE -FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic -FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic +FMain.tvPlan["Prep2"].Selected = TRUE +FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic +FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic + FMain.btback.Enabled = TRUE FMain.btback.ForeColor = Color.Black 'FMain.frmNext = FrmPartSel @@ -75,7 +76,7 @@ PUBLIC SUB Form_Hide() -FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic +'FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic END Modified: branches/iVL/FrmPartSel.class ============================================================================== --- branches/iVL/FrmPartSel.class (original) +++ branches/iVL/FrmPartSel.class Fri Sep 26 13:15:26 2008 @@ -60,8 +60,8 @@ ClsPartSel.bDoWin = FALSE FMain.btback.Enabled = TRUE FMain.btback.ForeColor = Color.Black - FMain.tvPlan["Prep1"].Selected = TRUE - FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic + FMain.tvPlan["Prep2"].Selected = TRUE + FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic END Modified: branches/iVL/FrmPkgSel.class ============================================================================== --- branches/iVL/FrmPkgSel.class (original) +++ branches/iVL/FrmPkgSel.class Fri Sep 26 13:15:26 2008 @@ -23,9 +23,9 @@ .rbFull_Click() END WITH FMain.FrmCurr = ME - FMain.tvPlan["Prep2"].Selected = TRUE - FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic - FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic + FMain.tvPlan["Prep3"].Selected = TRUE + FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic + FMain.tvPlan["Prep3"].Picture = MdlCore.sNowPic FMain.btback.Enabled = TRUE FMain.btback.ForeColor = Color.Black Modified: branches/iVL/FrmPkgsel2.class ============================================================================== --- branches/iVL/FrmPkgsel2.class (original) +++ branches/iVL/FrmPkgsel2.class Fri Sep 26 13:15:26 2008 @@ -18,7 +18,7 @@ PUBLIC SUB Form_Open() WITH ME - .tlbanner.Text = "Select your indivirual packages to install. <br>To install them all, just click next" + .tlbanner.Text = ("Select your indivirual packages to install.") & " <br>" & ("To install them all, just click next") .tlbanner.Adjust '.tlbanner.Border = Border.Plain '.tlbanner.Width = MdlObjSizer.get_object_width(.tlbanner.Text) @@ -26,8 +26,8 @@ END WITH FMain.FrmCurr = ME FMain.btback.Enabled = TRUE - FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic - FMain.tvPlan["Prep2"].Selected = TRUE + FMain.tvPlan["Prep3"].Picture = MdlCore.sNowPic + FMain.tvPlan["Prep3"].Selected = TRUE FMain.btback.ForeColor = Color.Black MdlPkgSel.LIST_PACKAGE_SELECTION() Modified: branches/iVL/FrmSelISO.class ============================================================================== --- branches/iVL/FrmSelISO.class (original) +++ branches/iVL/FrmSelISO.class Fri Sep 26 13:15:26 2008 @@ -48,9 +48,7 @@ PUBLIC SUB Form_Open() - FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic - FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic - FMain.tvPlan["Prep1"].Selected = TRUE + ME.Width = ME.Parent.Width ME.Height = ME.Parent.Height @@ -72,7 +70,9 @@ tlBanner.Text = ("Click") & Space(1) & "\'" & FMain.btnext.text & "\'" & Space(1) & ("to begin installating ")& Left(FrmSelISO.lstInstallableImg.text, InStr(FrmSelISO.lstInstallableImg.text, "/") - 4) END IF - + FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic + FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic + FMain.tvPlan["Prep1"].Selected = TRUE END Modified: branches/iVL/FrmSummary.class ============================================================================== --- branches/iVL/FrmSummary.class (original) +++ branches/iVL/FrmSummary.class Fri Sep 26 13:15:26 2008 @@ -28,7 +28,7 @@ FMain.FrmCurr = ME FMain.tvPlan["Inst0"].Selected = TRUE - FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic + FMain.tvPlan["Prep3"].Picture = MdlCore.sDonePic FMain.tvPlan["Inst0"].Picture = MdlCore.sNowPic FMain.btback.Enabled = TRUE ' FMain.btback.ForeColor = Color.Black @@ -64,6 +64,6 @@ PUBLIC SUB Form_Hide() - FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic +' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic END |