From: <cod...@go...> - 2008-09-30 21:13:07
|
Author: M0...@gm... Date: Tue Sep 30 14:11:26 2008 New Revision: 192 Modified: branches/iVL/FrmEmbUsrAdd.class branches/iVL/FrmEmbUsrAdd.form branches/iVL/FrmLangSel.class branches/iVL/FrmLangSel.form branches/iVL/FrmLilo.class branches/iVL/FrmLilo.form branches/iVL/FrmNetConf.class branches/iVL/FrmNetConf.form branches/iVL/FrmPartScheme.class branches/iVL/FrmPartScheme.form branches/iVL/FrmPartSel.class branches/iVL/FrmPartSel.form branches/iVL/FrmPkgSel.class branches/iVL/FrmPkgSel.form branches/iVL/FrmRootPass.class branches/iVL/FrmRootPass.form branches/iVL/FrmSelISO.class branches/iVL/FrmSelISO.form branches/iVL/FrmWinDrives.class branches/iVL/FrmWinDrives.form branches/iVL/FrmZoneSet.class branches/iVL/FrmZoneSet.form branches/iVL/MdlPartSel.module Log: - Added <h3> header banners to all child windows - Added a horizontal line below the banner on each child window (for looks) - Re-mastered the user-add window to show a label after the useradd.gambas application is stopped * Consider adding a nice picture here * Consider listing already created user accounts here Modified: branches/iVL/FrmEmbUsrAdd.class ============================================================================== --- branches/iVL/FrmEmbUsrAdd.class (original) +++ branches/iVL/FrmEmbUsrAdd.class Tue Sep 30 14:11:26 2008 @@ -17,17 +17,23 @@ PUBLIC SUB Form_Open() + ME.tlbanner.Text = "<h3>" & ("User Accounts") & "</h3>" + ME.tlExp.Text = "<h3>" & ("Create initial user accounts") & "</h3><br>" & + ("Click the button below to create a new user account.") & "<br>" & + ("New user accounts can also be created after the install process is completed.") + ME.tlExp.Visible = FALSE + WITH FMain .FrmCurr = ME - .tvPlan["Conf2"].Picture = MdlCore.sDonePic - .tvPlan["Conf3"].picture = MdlCore.sNowPic - .tvPlan["Conf3"].Selected = TRUE + ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic + ' .tvPlan["Conf3"].picture = MdlCore.sNowPic + ' .tvPlan["Conf3"].Selected = TRUE END WITH ME.EMBED_VASMCC_MODULE() - 'btAddUser.Visible = FALSE - + 'btAddUser.Visible = FALSE + END @@ -46,8 +52,13 @@ PUBLIC SUB Form_Resize() WITH ME - .Embedder1.Move(0, 2, .ClientWidth - 4, .ClientHeight - 24) - .btAddUser.Move(4, .top + .ClientHeight - (.btAddUser.Height * 2), MdlObjSizer.get_object_width(.btAddUser.text) + 24) + .tlbanner.Move(4, 4, .ClientWidth - (.tlbanner.Left * 2)) + .hrsep.Move(4, .tlbanner.top + (.tlbanner.Height - .hrsep.Height), .tlbanner.Width) + .tlExp.Move(8, .hrsep.top + .hrsep.Height + 32, .ClientWidth - (.tlExp.Left * 2)) + + .Embedder1.Move(4, .hrsep.top + .hrsep.Height + 8, .hrsep.Width, .clientHeight - ((.hrsep.top) + .tlbanner.Height + .btAddUser.Height + .hrsep.height)) + .btAddUser.Move(.ClientWidth / 2 - (.btAddUser.Width / 2), .tlExp.top + .tlExp.Height + 12, MdlObjSizer.get_object_width(.btAddUser.text) + 36) + END WITH @@ -58,6 +69,7 @@ MdlCore.unlock_gui() btAddUser.Show Embedder1.Hide + ME.tlExp.Show @@ -68,6 +80,7 @@ ME.EMBED_VASMCC_MODULE() ME.Embedder1.show ME.btAddUser.Hide + ME.tlExp.Hide 'btAddUser.Visible = FALSE END Modified: branches/iVL/FrmEmbUsrAdd.form ============================================================================== --- branches/iVL/FrmEmbUsrAdd.form (original) +++ branches/iVL/FrmEmbUsrAdd.form Tue Sep 30 14:11:26 2008 @@ -4,10 +4,22 @@ MoveScaled(0,0,64,64) Text = ("") { Embedder1 Embedder - MoveScaled(1,2,58,51) + MoveScaled(1,29,58,26) } { btAddUser Button - MoveScaled(48,54,10,3) + MoveScaled(49,57,10,3) Text = ("New User Account") + Picture = Picture["icon:/16/add"] + } + { tlbanner TextLabel + MoveScaled(1,1,18,3.4286) + Text = ("") + } + { hrsep Separator + MoveScaled(11,6,9,1) + } + { tlExp TextLabel + MoveScaled(2,13,60,13) + Text = ("") } } Modified: branches/iVL/FrmLangSel.class ============================================================================== --- branches/iVL/FrmLangSel.class (original) +++ branches/iVL/FrmLangSel.class Tue Sep 30 14:11:26 2008 @@ -43,6 +43,7 @@ WITH ME .tlBanner.Move(8, 4, MdlObjSizer.get_object_width(.tlBanner.text)) + .Separator1.Move(8, .tlBanner.top + .tlBanner.Height - .Separator1.Height, .ClientWidth - (.Separator1.Left * 2)) .lbLangSel.Move(8, .tlBanner.top + .tlBanner.Height + 4) .lbLangSel.Resize((ME.Width / 3), ME.Height - (.tlBanner.Height * 2)) END WITH Modified: branches/iVL/FrmLangSel.form ============================================================================== --- branches/iVL/FrmLangSel.form (original) +++ branches/iVL/FrmLangSel.form Tue Sep 30 14:11:26 2008 @@ -13,4 +13,7 @@ Text = ("Select your language") Alignment = Align.Normal } + { Separator1 Separator + MoveScaled(1,5,61,2) + } } Modified: branches/iVL/FrmLilo.class ============================================================================== --- branches/iVL/FrmLilo.class (original) +++ branches/iVL/FrmLilo.class Tue Sep 30 14:11:26 2008 @@ -20,8 +20,9 @@ PUBLIC SUB Form_Open() DIM sOut AS String - -'ClsPartSel.sRoot = "/dev/sdb1" ' + + ME.tlBanner.Text = "<h3>" & tlBanner.text & "</h3>" + 'ClsPartSel.sRoot = "/dev/sdb1" ' FMain.FrmCurr = ME FMain.tvPlan["Conf0"].Selected = TRUE FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic @@ -96,18 +97,19 @@ .tlFbMode.Alignment = Align.Normal .tlBanner.Move(4, 4) .tlBanner.Width = .ClientWidth - (.tlBanner.x * 2) - .YNLiloBox.Move(.tlBanner.left, .tlBanner.Top + (.tlBanner.Height + 1.5), MdlObjSizer.get_object_width(.YNLiloBox.text) + 36, 21) + .hrsep.Move(4, .tlBanner.top + .tlBanner.Height - 4, .tlBanner.Width) + .YNLiloBox.Move(.tlBanner.left, .hrSep.Top + .hrSep.Height + 4, MdlObjSizer.get_object_width(.YNLiloBox.text) + 36, 21) .tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height * 1.5), MdlObjSizer.get_object_width(.tlTarGet.Text)) .LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 4, .tlTarGet.top, (.tlBanner.Width / 2.75) - (.tlTarGet.Width + .tlTarGet.left)) .tlFbMode.Move(.LiloTarget.Left + LiloTarget.Width + 32, .LiloTarget.top, MdlObjSizer.get_object_width(.tlFbMode.text)) .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width + 4, .tlFbMode.top, .tlBanner.Width - .FBResolution.Left * 1.30) - .tlTimeOUt.Move(.tlTarGet.left, .tlTarGet.top + .tlTarGet.Height + 4, MdlObjSizer.get_object_width(.tlTimeOUt.Text)) + .tlTimeOUt.Move(.tlTarGet.left, .tlTarGet.top + .tlTarGet.Height + 12, MdlObjSizer.get_object_width(.tlTimeOUt.Text)) .sbTimer.Move(.tlTimeOUt.Left + .tlTimeOUt.Width + 4, .tlTimeOUt.top, 60) .tlTimoutSec.Move(.sbTimer.Left + .sbTimer.Width + 4, .sbTimer.top, MdlObjSizer.get_object_width(.tlTimoutSec.text)) .tlDefBoot.Move(.tlFbMode.Left, .sbTimer.top, MdlObjSizer.get_object_width(.tlDefBoot.text), 27) .cbDefBoot.Move(.tlDefBoot.Left + .tlDefBoot.Width + 4, .tlDefBoot.top, .tlBanner.Width - .cbDefBoot.Left * 1.3) - .tlList.Move(.tlTimeOUt.left, .tlTimeOUt.top + .tlTimeOUt.Height + 8, .tlBanner.Width) + .tlList.Move(.tlTimeOUt.left, .tlTimeOUt.top + .tlTimeOUt.Height + 12, .tlBanner.Width) .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height + 8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.tlBanner.Height * 6)) @@ -120,7 +122,7 @@ DIM box AS TextBox ME.sVidMode = Trim(ME.FBResolution.Text) 'MdlLiloOsList.LIST_LILO_OS_CHOICES() - IF Trim(ME.FBResolution.Text) = "Standard" THEN + IF Trim(ME.FBResolution.Text) = ("Standard") THEN FOR EACH box IN MdlLiloOsList.txtAppends 'box.Enabled = FALSE box.text = Replace(box.text, "splash=silent", "") '"Not available in \'Standard\' resolution mode" Modified: branches/iVL/FrmLilo.form ============================================================================== --- branches/iVL/FrmLilo.form (original) +++ branches/iVL/FrmLilo.form Tue Sep 30 14:11:26 2008 @@ -4,11 +4,11 @@ MoveScaled(0,0,74,69) Text = ("") { tlBanner TextLabel - MoveScaled(1,1,58,4.4286) + MoveScaled(1,1,58,4) Text = ("Configure and install lilo (Linux Boot Loader)") } { YNLiloBox CheckBox - MoveScaled(1,5,18,3) + MoveScaled(1,7,18,3) Text = ("Don't Install Lilo") } { TabStrip1 TabStrip @@ -18,54 +18,57 @@ Index = 0 } { tlList TextLabel - MoveScaled(1,19,57,6) + MoveScaled(1,21,57,6) Text = ("TextLabel1") } { LiloTarget ComboBox - MoveScaled(13,9,19,3) + MoveScaled(13,11,19,3) Text = ("") ReadOnly = True List = [] } { tlTarGet TextLabel - MoveScaled(1,9,10,3) + MoveScaled(1,11,10,3) Text = ("Target") - Alignment = Align.Normal + Alignment = Align.BottomLeft } { tlFbMode TextLabel - MoveScaled(33,9,18,3) + MoveScaled(33,11,18,3) Text = ("Video Resolution") Alignment = Align.Normal } { FBResolution ComboBox - MoveScaled(52,9,21,3) + MoveScaled(52,11,21,3) Text = ("") ReadOnly = True List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"), ("Bootsplash Extra high")] } { tlTimeOUt TextLabel - MoveScaled(1,14,18,3) + MoveScaled(1,16,18,3) Text = ("Prompt Timeout") Alignment = Align.Normal } { sbTimer SpinBox - MoveScaled(20,14,9,3) + MoveScaled(20,16,9,3) Value = 3 } { tlTimoutSec TextLabel - MoveScaled(30,14,7,3) + MoveScaled(30,16,7,3) Text = ("Seconds") Alignment = Align.Normal } { tlDefBoot TextLabel - MoveScaled(33,14,18,3) + MoveScaled(33,16,18,3) Text = ("Boot Default") Alignment = Align.Normal } { cbDefBoot ComboBox - MoveScaled(52,13,21,3) + MoveScaled(52,15,21,3) Text = ("") ReadOnly = True List = [] + } + { hrSep Separator + MoveScaled(11,5,19,1) } } Modified: branches/iVL/FrmNetConf.class ============================================================================== --- branches/iVL/FrmNetConf.class (original) +++ branches/iVL/FrmNetConf.class Tue Sep 30 14:11:26 2008 @@ -42,7 +42,7 @@ ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME() MdlNetConf.LIST_NETWORK_INTERFACES cbUseManDNS.Value = FALSE - tlBanner.text = "<h2>" & tlBanner.text & "</h2>" + tlBanner.text = "<h3>" & tlBanner.text & "</h3>" IF ERROR THEN Message(Error.text & "\n" & Error.where) @@ -63,8 +63,9 @@ DIM itxtboxleft AS Integer WITH ME - .tlBanner.Move(8, 8, MdlObjSizer.get_object_width(.tlBanner.text)) - .tlHostNameLbl.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 4, MdlObjSizer.get_object_width(.tlHostNameLbl.text), 21) + .tlBanner.Move(4, 8, .ClientWidth - (.tlBanner.left * 2)) + .hrSep.Move(4, .tlBanner.top + .tlBanner.Height - 4, .tlBanner.Width) + .tlHostNameLbl.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8, MdlObjSizer.get_object_width(.tlHostNameLbl.text), 21) .txtHostName.Move(.tlHostNameLbl.left + .tlHostNameLbl.Width + 4, .tlHostNameLbl.top) .cbUseManDNS.Move(.tlHostNameLbl.Left, .tlHostNameLbl.top + .tlHostNameLbl.Height + 10, MdlObjSizer.get_object_width(.cbUseManDNS.text) + 24) .tlPrimaryDNS.Move(.cbUseManDNS.left, .cbUseManDNS.top + .cbUseManDNS.Height + 4, MdlObjSizer.get_object_width(.tlPrimaryDNS.text)) Modified: branches/iVL/FrmNetConf.form ============================================================================== --- branches/iVL/FrmNetConf.form (original) +++ branches/iVL/FrmNetConf.form Tue Sep 30 14:11:26 2008 @@ -1,7 +1,7 @@ # Gambas Form File 2.0 { Form Form - MoveScaled(0,0,114.2857,74) + MoveScaled(0,0,114.1429,74) Text = ("") { tlHostNameLbl TextLabel MoveScaled(1,8,16,3) @@ -49,8 +49,11 @@ Text = ("") } { tlBanner TextLabel - MoveScaled(1,1,45,5) - Text = ("NETWORK CONFIGURATION") + MoveScaled(1,1,45,4) + Text = ("Network Configuration") Alignment = Align.Normal + } + { hrSep Separator + MoveScaled(13,6,33,1) } } Modified: branches/iVL/FrmPartScheme.class ============================================================================== --- branches/iVL/FrmPartScheme.class (original) +++ branches/iVL/FrmPartScheme.class Tue Sep 30 14:11:26 2008 @@ -20,7 +20,9 @@ PUBLIC SUB Form_Resize() WITH ME - .tlBanner.Width = .ClientWidth - 10 + '.tlBanner.Width = .ClientWidth - 10 + .tlBanner.Move(4, 8, .ClientWidth - (.tlBanner.Left * 2)) + .hrsep.Move(.tlBanner.left, .tlBanner.top + .tlBanner.Height - (.hrsep.Height), .tlBanner.Width) .rbUseExisting.Move(.tlBanner.Left, .tlBanner.Top + .tlBanner.Height + 8) .rbEditPartitions.Move(.rbUseExisting.Left, .rbUseExisting.Top + .rbUseExisting.Height + 4) .tlChoiceExp.Move(.rbEditPartitions.Left, .rbEditPartitions.top + .rbEditPartitions.Height * 4, .tlBanner.Width - 10) @@ -32,6 +34,7 @@ PUBLIC SUB Form_Open() + ME.tlBanner.text = "<h3>" & ME.tlBanner.text & "</h3>" FMain.FrmCurr = ME FMain.tvPlan["Prep2"].Selected = TRUE FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic Modified: branches/iVL/FrmPartScheme.form ============================================================================== --- branches/iVL/FrmPartScheme.form (original) +++ branches/iVL/FrmPartScheme.form Tue Sep 30 14:11:26 2008 @@ -5,18 +5,21 @@ Text = ("") { tlBanner TextLabel MoveScaled(1,1,51,4) - Text = ("Select your disk partition option") + Text = ("Disk Partitioning Options") } { rbUseExisting RadioButton - MoveScaled(1,6,32,3.1429) + MoveScaled(1,7,32,3.1429) Text = ("Use existing disk partitions") } { rbEditPartitions RadioButton - MoveScaled(1,10,62,3.1429) + MoveScaled(1,11,62,3.1429) Text = ("Modify my disk partitions to make room for new installation") } { tlChoiceExp TextLabel MoveScaled(1,16,76,27) Text = ("TextLabel1") + } + { hrsep Separator + MoveScaled(43,6,23,1) } } Modified: branches/iVL/FrmPartSel.class ============================================================================== --- branches/iVL/FrmPartSel.class (original) +++ branches/iVL/FrmPartSel.class Tue Sep 30 14:11:26 2008 @@ -37,7 +37,11 @@ DIM iWidth AS Integer = 0 WITH ME - .tlBanner.Width = .ClientWidth - .btHelp.Width - 16 + + '.tlBanner.Width = .ClientWidth - .btHelp.Width - 16 + .tlBanner.Move(4, 4, .ClientWidth - ((.tlBanner.Left * 2) + .btHelp.Width + 16)) + .hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width + .btHelp.Width) + .scrollPartitions.Move(4, .hrSep.top + .hrSep.Height + 8, .ClientWidth - (.hrSep.Left * 2), .ClientHeight - (.hrSep.top + (.cbDoWin.Height * 2))) .scrollPartitions.Resize(.tlBanner.Width + 4 + .btHelp.Width, .ClientHeight - .tlBanner.Height - (cbDoWin.Height * 3)) .cbDoWin.Move(.scrollPartitions.Left, .ClientHeight - .cbDoWin.Height - 8) .btHelp.Move(.tlBanner.Left + .tlBanner.Width + 4, .tlBanner.top, MdlObjSizer.get_object_width(.btHelp.text) + 32) '+ (.tlBanner.Height / 3)) @@ -49,7 +53,7 @@ PUBLIC SUB Form_Open() - + ME.tlBanner.text = "<h3>" & tlBanner.text & "</h3>" FMain.FrmCurr = ME ME.btHelp.Width = MdlObjSizer.get_object_width(btHelp.text) + 32 ME.Resize(ME.Parent.Width, ME.Parent.Height - (ME.cbDoWin.height * 3)) Modified: branches/iVL/FrmPartSel.form ============================================================================== --- branches/iVL/FrmPartSel.form (original) +++ branches/iVL/FrmPartSel.form Tue Sep 30 14:11:26 2008 @@ -4,14 +4,14 @@ MoveScaled(0,0,72,55) Text = ("") { tlBanner TextLabel - MoveScaled(1,1,61,3.8571) + MoveScaled(1,1,61,3.7143) Text = ("Please select the partitions you wish to use and how to use them") } { scrollPartitions ScrollView - MoveScaled(1,6,69,41) + MoveScaled(1,9,69,38) } { cbDoWin CheckBox - MoveScaled(1,50,57,3.2857) + MoveScaled(1,50,57,3.1429) ToolTip = ("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") Text = ("Detect and Setup Windows partitions for auto-mounting at boot") } @@ -19,5 +19,8 @@ MoveScaled(63,1,8,3) Text = ("Help") Picture = Picture["icon:/small/help"] + } + { hrSep Separator + MoveScaled(3,6,19,1) } } Modified: branches/iVL/FrmPkgSel.class ============================================================================== --- branches/iVL/FrmPkgSel.class (original) +++ branches/iVL/FrmPkgSel.class Tue Sep 30 14:11:26 2008 @@ -19,7 +19,7 @@ PUBLIC SUB Form_Open() WITH ME - .tlBanner.Text = "Choose your installation mode" + .tlBanner.Text = "<h3>" & ("Choose your installation mode") & "</h3>" .rbFull_Click() END WITH FMain.FrmCurr = ME @@ -35,8 +35,9 @@ WITH ME '.tlBanner.Width = .ClientWidth - 8 - .tlBanner.Move(4, 4, .ClientWidth - 8, 27) - .rbFull.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8, MdlObjSizer.get_object_width(.rbfull.text) + 36) + .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2), 27) + .hrSep.Move(4, .tlBanner.top + .tlBanner.Height - (.hrSep.H), .tlBanner.Width) + .rbFull.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 12, MdlObjSizer.get_object_width(.rbfull.text) + 36) .rbCustom.Move(.tlBanner.Left, .rbFull.top + .rbFull.Height + 4, MdlObjSizer.get_object_width(.rbcustom.text) + 36) .tlActionDesc.Width = .tlBanner.Width - 4 .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top + .tlActionDesc.Height + 8, .tlActionDesc.Width - 12, .ClientHeight - (.tlActionDesc.top + (.tlActionDesc.height * 2.75))) @@ -66,10 +67,10 @@ PUBLIC SUB Form_Hide() - IF ClsPkgSel.bCustom = FALSE THEN - - FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic - END IF +' IF ClsPkgSel.bCustom = FALSE THEN +' +' ' FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic +' END IF END PUBLIC SUB Form_Show() Modified: branches/iVL/FrmPkgSel.form ============================================================================== --- branches/iVL/FrmPkgSel.form (original) +++ branches/iVL/FrmPkgSel.form Tue Sep 30 14:11:26 2008 @@ -9,11 +9,11 @@ Alignment = Align.Normal } { rbFull RadioButton - MoveScaled(1,7,40,3.375) + MoveScaled(1,9,40,3.2857) Text = ("Full Install") } { rbCustom RadioButton - MoveScaled(1,12,55,3.375) + MoveScaled(1,13,55,3.2857) Text = ("Custom Install") } { tlActionDesc TextLabel @@ -22,5 +22,8 @@ } { scrlInstallOpts ScrollView MoveScaled(1,24,52,28) + } + { hrSep Separator + MoveScaled(34,7,20,1) } } Modified: branches/iVL/FrmRootPass.class ============================================================================== --- branches/iVL/FrmRootPass.class (original) +++ branches/iVL/FrmRootPass.class Tue Sep 30 14:11:26 2008 @@ -21,9 +21,9 @@ END WITH WITH FMain - .tvPlan["Conf1"].Picture = MdlCore.sDonePic - .tvPlan["Conf2"].picture = MdlCore.sNowPic - .tvPlan["Conf2"].Selected = TRUE + ' .tvPlan["Conf1"].Picture = MdlCore.sDonePic + ' .tvPlan["Conf2"].picture = MdlCore.sNowPic + ' .tvPlan["Conf2"].Selected = TRUE END WITH END @@ -51,7 +51,8 @@ DIM itxtLeft AS Integer WITH ME - .tlbanner.Move(4, 4) + .tlbanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2)) + .hrSep.Move(4, .tlBanner.top + .tlBanner.Height - .hrSep.Height * 2, .tlBanner.Width) .Frame1.Resize(.ClientWidth - (.Frame1.Left * 2), .tlBanner.Height * 4) .tlAboutRoot.Move(4, 24, .Frame1.Width - (.tlAboutRoot.Left * 2), .Frame1.Height - .tlAboutRoot.top - 8) .tlPass1.Move(.Frame1.left, .Frame1.top + .Frame1.Height + 24, MdlObjSizer.get_object_width(.tlPass1.text), 21) Modified: branches/iVL/FrmRootPass.form ============================================================================== --- branches/iVL/FrmRootPass.form (original) +++ branches/iVL/FrmRootPass.form Tue Sep 30 14:11:26 2008 @@ -4,7 +4,7 @@ MoveScaled(0,0,87,56) Text = ("") { Frame1 Frame - MoveScaled(1,6,72,22) + MoveScaled(1,8,72,22) Text = (" About the root account ") { tlAboutRoot TextLabel MoveScaled(2,3,67,16) @@ -12,29 +12,32 @@ } } { tlBanner TextLabel - MoveScaled(2,1,62,4) + MoveScaled(2,1,62,3.4286) Text = ("System Administrator") } { tbPasswd2 TextBox - MoveScaled(31,35,21,3.5) + MoveScaled(31,37,21,3.4286) Text = ("") Password = True } { tlPass2 TextLabel - MoveScaled(2,35,22,4) + MoveScaled(2,37,22,4) Text = ("Re-Enter Password") } { tbPasswd1 TextBox - MoveScaled(29,29,21,3.5) + MoveScaled(29,31,21,3.4286) Text = ("") Password = True } { tlPass1 TextLabel - MoveScaled(2,30,22,4) + MoveScaled(2,32,22,4) Text = ("Enter Password") } { Button1 Button - MoveScaled(53,49,11,2) + MoveScaled(53,51,11,2) Text = ("Set Password") + } + { hrSep Separator + MoveScaled(39,5,15,1) } } Modified: branches/iVL/FrmSelISO.class ============================================================================== --- branches/iVL/FrmSelISO.class (original) +++ branches/iVL/FrmSelISO.class Tue Sep 30 14:11:26 2008 @@ -50,6 +50,8 @@ + ME.tlBanner.text = "<h3>" & tlBanner.text & "</h3>" + ME.Width = ME.Parent.Width ME.Height = ME.Parent.Height ME.btResCan.Height = ME.lstInstallableImg.Height @@ -67,7 +69,7 @@ END IF IF lstInstallableImg.count = 1 THEN - tlBanner.Text = ("Click") & Space(1) & "\'" & FMain.btnext.text & "\'" & Space(1) & ("to begin installating ")& + tlBanner.Text = ("Click") & Space(1) & "\'" & FMain.btnext.text & "\'" & Space(1) & ("to begin installating") & Space(1)& Left(FrmSelISO.lstInstallableImg.text, InStr(FrmSelISO.lstInstallableImg.text, "/") - 4) END IF FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic @@ -171,12 +173,16 @@ PUBLIC SUB Form_Resize() WITH ME - .Reparent(.Parent) - .Resize(.Parent.Width, .Parent.Height) + '.Reparent(.Parent) + '.Resize(.Parent.Width, .Parent.Height) + ' .btNext.Move(.Left + .Width - .btNext.Width - 8, .top + ME.Height - .btNext.Height - 8) - .btResCan.Move(.Left + .Width - .btResCan.Width - 8, .top + .tlBanner.Height + 12, MdlObjSizer.get_object_width(.btResCan.text) + 36) - .lstInstallableImg.Move(.left + 4, .btResCan.Top, .Width - (.btResCan.Width + 24)) - .FullScreen = TRUE + .tlBanner.Move(4, 8, MdlObjSizer.get_object_width(.tlBanner.text)) + .hrSep.Move(4, .tlBanner.top + .tlBanner.Height - .hrSep.Height, .ClientWidth - (.hrSep.x * 2)) + .btResCan.Move(.Left + .Width - .btResCan.Width - 8, .top + .tlBanner.Height + 48, MdlObjSizer.get_object_width(.btResCan.text) + 36) + .lstInstallableImg.Move(.left + 4, .btResCan.Top, .Width - (.btResCan.Width + 24), 21) + .tlDistroDesc.Move(.lstInstallableImg.Left * 2, .lstInstallableImg.top + .lstInstallableImg.Height + 48) + '.FullScreen = TRUE END WITH END Modified: branches/iVL/FrmSelISO.form ============================================================================== --- branches/iVL/FrmSelISO.form (original) +++ branches/iVL/FrmSelISO.form Tue Sep 30 14:11:26 2008 @@ -5,7 +5,7 @@ Text = ("") FullScreen = True { lstInstallableImg ComboBox - MoveScaled(1,7,45,3.2857) + MoveScaled(1,10,45,3.1429) Text = ("No installable images found.") ReadOnly = True } @@ -14,12 +14,15 @@ Text = ("Select which VectorLinux version you wish to install from the list below") } { tlDistroDesc TextLabel - MoveScaled(1,13,60,22) + MoveScaled(1,16,60,22) Text = ("TextLabel1") } { btResCan Button - MoveScaled(49,7,13,3.2857) + MoveScaled(49,10,13,3.1429) Text = ("Search Again") Picture = Picture["icon:/16/refresh"] + } + { hrSep Separator + MoveScaled(2,7,43,1) } } Modified: branches/iVL/FrmWinDrives.class ============================================================================== --- branches/iVL/FrmWinDrives.class (original) +++ branches/iVL/FrmWinDrives.class Tue Sep 30 14:11:26 2008 @@ -18,6 +18,7 @@ PUBLIC SUB Form_Open() +ME.tlBanner.Text = "<h3>" & tlbanner.text & "</h3>" ME.Resize(ME.ClientWidth - 12, ME.ClientH - 12) MdlWinDrives.LIST_WIN_PARTITIONS 'ME.Resize(ME.Parent.Width - 12, ME.Parent.Height - 12) @@ -31,9 +32,10 @@ PUBLIC SUB Form_Resize() WITH ME - .tlBanner.Width = .ClientW - 4 - '.svWinDrives.Resize(.ClientWidth - 4, .ClientHeight - (.tlBanner.Width * 1.5)) - .svWinDrives.Move(.tlBanner.Left, .tlBanner.top + (.tlBanner.Height + 4), .tlBanner.Width - 20, .ClientH - (.tlbanner.height * 2)) + + .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2)) + .hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width) + .svWinDrives.Move(.tlBanner.Left, .tlBanner.top + (.tlBanner.Height + 12), .tlBanner.Width - 20, .ClientH - (.tlbanner.height * 2)) END WITH Modified: branches/iVL/FrmWinDrives.form ============================================================================== --- branches/iVL/FrmWinDrives.form (original) +++ branches/iVL/FrmWinDrives.form Tue Sep 30 14:11:26 2008 @@ -11,4 +11,7 @@ MoveScaled(1,1,65,5) Text = ("Select the windows partitions you would like to mount during boot") } + { hrSep Separator + MoveScaled(24,6,25,1) + } } Modified: branches/iVL/FrmZoneSet.class ============================================================================== --- branches/iVL/FrmZoneSet.class (original) +++ branches/iVL/FrmZoneSet.class Tue Sep 30 14:11:26 2008 @@ -18,22 +18,23 @@ PUBLIC SUB Form_Open() Fmain.frmcurr = ME + ME.tlbanner.Text = "<h3>" & ("Timezone configuration") & "</h3>" WITH FMain - .tvPlan["Conf0"].Picture = MdlCore.sDonePic - .tvPlan["Conf1"].picture = MdlCore.sNowPic - .tvPlan["Conf1"].Selected = TRUE + ' .tvPlan["Conf0"].Picture = MdlCore.sDonePic + ' .tvPlan["Conf1"].picture = MdlCore.sNowPic + ' .tvPlan["Conf1"].Selected = TRUE END WITH - + FMain.btnext.Enabled = FALSE MdlZoneSet.TIME_ZONES() - ME.lbTmZone.Index = 9 + 'ME.lbTmZone.Index = 9 END PUBLIC SUB lbTmZone_Click() 'Message(ME.lbTmZone.Text) - + FMain.btnext.Enabled = TRUE END @@ -49,13 +50,16 @@ PUBLIC SUB Form_Resize() WITH ME - .Frame1.Move(4, 4, .ClientWidth - (.Frame1.left * 2), .ClientHeight - (.Frame1.top * 2)) - .TextLabel1.Move(4, 18, .Frame1.Width - (.TextLabel1.Left * 2)) + '.Frame1.Move(4, 4, .ClientWidth - (.Frame1.left * 2), .ClientHeight - (.Frame1.top * 2)) + .tlbanner.Move(4, 4, .ClientWidth - (.tlbanner.Left * 2)) + .hrsep.Move(4, .tlbanner.top + .tlbanner.Height, .tlbanner.Width) + .TextLabel1.Move(4, .hrsep.top + .hrsep.Height + 8, .hrsep.Width) .TextLabel1.Adjust .cbHwClock.Move(.TextLabel1.left, .TextLabel1.top + .TextLabel1.Height + 4, (.TextLabel1.width / 2), 21) .TextLabel2.Move(4, .cbHwClock.top + cbHwClock.Height + 8, .TextLabel1.Width) .lbTmZone.Move(4, .TextLabel2.top + .TextLabel2.Height + 4, .cbHwClock.Width) - .lbTmZone.Height = .Frame1.Height - (.TextLabel1.Height + .cbHwClock.Height + (.TextLabel2.Height * 4)) + '.lbTmZone.Height = .Frame1.Height - (.TextLabel1.Height + .cbHwClock.Height + (.TextLabel2.Height * 4)) + .lbTmZone.Height = .ClientHeight - (.lbTmZone.top + .TextLabel1.Height) Modified: branches/iVL/FrmZoneSet.form ============================================================================== --- branches/iVL/FrmZoneSet.form (original) +++ branches/iVL/FrmZoneSet.form Tue Sep 30 14:11:26 2008 @@ -3,30 +3,33 @@ { Form Form MoveScaled(0,0,81,55) Text = ("") - { Frame1 Frame - MoveScaled(1,2,78,52) + { Button1 Button + MoveScaled(49,46,12,3) + Visible = False + Text = ("Set TimeZone") + } + { lbTmZone ListBox + MoveScaled(1,23,32,23) + } + { TextLabel2 TextLabel + MoveScaled(1,19,41,3) + Text = ("Choose the correct timezone for the area in which you live.") + } + { cbHwClock ComboBox + MoveScaled(1,15,34,3.4286) + Text = ("ComboBox1") + ReadOnly = True + List = [("LocalTime"), ("UTC")] + } + { TextLabel1 TextLabel + MoveScaled(1,7,74,8) + Text = ("Choose how\nyour hardware clock is set up.\nChoose UTC if you know that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT). Otherwise,\nChoose localtime since most PCs are setup this way.") + } + { tlbanner TextLabel + MoveScaled(2,1,27,3.4286) Text = ("") - { TextLabel1 TextLabel - MoveScaled(1,2,74,8) - Text = ("Choose how\nyour hardware clock is set up.\nChoose UTC if you know that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT). Otherwise,\nChoose localtime since most PCs are setup this way.") - } - { TextLabel2 TextLabel - MoveScaled(1,15,41,3) - Text = ("Choose the correct timezone for the area in which you live.") - } - { lbTmZone ListBox - MoveScaled(1,19,32,23) - } - { cbHwClock ComboBox - MoveScaled(1,11,34,3.5) - Text = ("ComboBox1") - ReadOnly = True - List = [("LocalTime"), ("UTC")] - } - { Button1 Button - MoveScaled(47,47,12,3) - Visible = False - Text = ("Set TimeZone") - } + } + { hrsep Separator + MoveScaled(22,5,13,1) } } Modified: branches/iVL/MdlPartSel.module ============================================================================== --- branches/iVL/MdlPartSel.module (original) +++ branches/iVL/MdlPartSel.module Tue Sep 30 14:11:26 2008 @@ -54,7 +54,7 @@ sDump1 = Trim(sDump1) - y = 4 + y = 8 x = 8 ' IF InStr(sDump1, gb.NewLine) > 0 THEN |