From: <cod...@go...> - 2008-08-08 19:25:00
|
Author: M0...@gm... Date: Fri Aug 8 12:24:44 2008 New Revision: 113 Modified: branches/iVL/.lang/FMain.pot branches/iVL/.project branches/iVL/FMain.class branches/iVL/FMain.form branches/iVL/FrmLilo.class branches/iVL/FrmLilo.form branches/iVL/MdlConfLilo.module branches/iVL/MdlCore.module branches/iVL/MdlDiskPart.module branches/iVL/MdlLiloOsList.module Log: - Began working on adding windows installs to the lilo config options - Repositioned objects in the LILO window to make them visible a smaller resolutions. - Found problem with append box on the tab strip (not fixed yet) Modified: branches/iVL/.lang/FMain.pot ============================================================================== --- branches/iVL/.lang/FMain.pot (original) +++ branches/iVL/.lang/FMain.pot Fri Aug 8 12:24:44 2008 @@ -14,19 +14,19 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain.class:257 +#: FMain.class:271 msgid "Process Overview" msgstr "" -#: FMain.class:280 +#: FMain.class:290 msgid "Next" msgstr "" -#: FMain.class:286 +#: FMain.class:296 msgid "Back" msgstr "" -#: FMain.class:292 +#: FMain.class:302 msgid "Exit" msgstr "" Modified: branches/iVL/.project ============================================================================== --- branches/iVL/.project (original) +++ branches/iVL/.project Fri Aug 8 12:24:44 2008 @@ -1,6 +1,6 @@ # Gambas Project File 2.0 Title=VectorLinux Installer -Startup=FrmLilo +Startup=MdlCore Version=0.0.33 Library=gb.gtk Library=gb.form Modified: branches/iVL/FMain.class ============================================================================== --- branches/iVL/FMain.class (original) +++ branches/iVL/FMain.class Fri Aug 8 12:24:44 2008 @@ -28,7 +28,8 @@ PUBLIC SUB Form_Open() DIM iImg AS Image -ME.Maximized = TRUE +'ME.Maximized = TRUE + MdlCore.LOCK_GUI 'MdlCore.LOCK_GUI() ClsGlobal.sBackNav = NEW Object[] @@ -42,10 +43,16 @@ PictureBox1.Picture = iImg.Picture PictureBox1.Background = Color.SelectedBackground PictureBox1.Stretch = TRUE - +MdlCore.PREPARE_INSTALL_LAYOUT FrmSelISO.Show +'FrmSelISO.Hide + + +'STOP EVENT +ME.Width = 800 +ME.Height = 600 + -MdlCore.PREPARE_INSTALL_LAYOUT WITH ME .btback.Enabled = FALSE @@ -60,6 +67,12 @@ END WITH 'ME.TreeView1.BackColor = Color.Transparent ME.AUTOSIZE_LEFT_PANE +WITH FrmLilo +.Reparent(Fmain.pnlWinHost) +.Width = Fmain.pnlWinHost.Width +.Height = Fmain.pnlWinHost.Height +.Show +END WITH END @@ -96,7 +109,7 @@ .btQuit.Width = MdlObjSizer.get_object_width(.btQuit.Text) + 36 END WITH 'ME.AUTOSIZE_LEFT_PANE - +'ME.pnlWinHost.Resize(ME.ClientWidth - ME.Frame1.Width - (ME.Frame1.left * 8), ME.ClientH - ME.tlBanner.Height - (ME.btback.Height * 8)) WITH ME .tlBanner.width = ME.width .Frame1.Move(4, .PictureBox1.Top + .PictureBox1.Height + 4, MdlCore.iLeftWidth * 1.5, .ClientHeight - .PictureBox1.Height * 1.5) @@ -106,7 +119,7 @@ '.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 * 3.5))) - .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.Top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight - (.tlBanner.Height + (.btback.Height * 3.5))) + .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.Top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight - (.tlBanner.Height + (.btback.Height * 3))) .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 @@ -117,6 +130,7 @@ .tlBanner.Height = .PictureBox1.Height .tlBanner.top = .PictureBox1.Top END WITH + END Modified: branches/iVL/FMain.form ============================================================================== --- branches/iVL/FMain.form (original) +++ branches/iVL/FMain.form Fri Aug 8 12:24:44 2008 @@ -19,9 +19,6 @@ Text = ("") Alignment = Align.Center } - { pnlWinHost VBox - MoveScaled(28,9,66,56) - } { btnext Button MoveScaled(49,67,8,3) Text = ("Next") @@ -40,5 +37,11 @@ { PictureBox1 PictureBox MoveScaled(36,1,54,8) Stretch = True + } + { pnlwinhost Panel + MoveScaled(27,10,56,41) + Expand = True + Arrangement = Arrange.Fill + Border = Border.Plain } } Modified: branches/iVL/FrmLilo.class ============================================================================== --- branches/iVL/FrmLilo.class (original) +++ branches/iVL/FrmLilo.class Fri Aug 8 12:24:44 2008 @@ -33,8 +33,21 @@ "for each one of them by clicking on each tab. To proceed with the default pre-set values, simply click \'" & FMain.btnext.text & "\'" ME.tlList.Adjust ME.TabStrip1.Index = 0 +MdlLiloOsList.bVlCliOption = FALSE + + +ME.TabStrip1.Index = 0 +ME.Maximized = TRUE +FBResolution_Click() +FBResolution.text = "Standard" END + + + + + + PUBLIC SUB YNLiloBox_Click() IF ME.YNLiloBox.value = TRUE THEN @@ -65,24 +78,31 @@ .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, 28) - .tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height * 1.5), MdlObjSizer.get_object_width(.tlTarGet.Text) + 8) - .LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 2, .tlTarGet.top, .tlBanner.Width - (.tlTarGet.Width + .tlTarGet.left)) - .tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height + 8, MdlObjSizer.get_object_width(.tlFbMode.Text) + 8) - .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width + 2, .tlFbMode.top, .tlBanner.Width - (.tlFbMode.Width + .tlFbMode.Left)) - .tlList.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height + 12, .tlBanner.Width) - .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height + 8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height * 6) - '.tlBanner2.Move(.tlFbMode.left, .FBResolution.top + .FBResolution.Height + 16, MdlObjSizer.get_object_width(.tlBanner2.Text) + 36) - '.LiloAppendBox.Move(.tlBanner2.left, .tlBanner2.top + .tlBanner2.Height + 4, .ClientWidth - (.LiloAppendBox.x) * 2) + .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 + 12, .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)) + .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)) + + '.tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height + 8, MdlObjSizer.get_object_width(.tlFbMode.Text) + 8) + '.FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width + 2, .tlFbMode.top, (.tlBanner.Width / 2) - (.tlFbMode.Width + .tlFbMode.Left)) + + '.tlDefaultBoot.Move(.tlFbMode.left, .tlFbMode.top + .tlFbMode.Height + 4, MdlObjSizer.get_object_width(.tlDefaultBoot.text) + 8) + '.cbDefaultOS.Move(.tlDefaultBoot.Left + .tlDefaultBoot.Width + 2, .tlDefaultBoot.top, .tlBanner.Width - (.tlDefaultBoot.width + .tldefaultboot.left)) + + '.tlTimeOUt.Move(.tlDefaultBoot.left, .tlDefaultBoot.top + .tlDefaultBoot.Height + 4, MdlObjSizer.get_object_width(.tlTimeOUt.text) + 8) + '.sbTimer.Move(.tlTimeOUt.left + .tlTimeOUt.Width + 2, .tlTimeOUt.top, 60) + '.tlTimoutSec.Move(.sbTimer.left + .sbTimer.Width + 4, .sbTimer.top, MdlObjSizer.get_object_width(.tlTimoutSec.text) + 8) + .tlList.Move(.tlTimeOUt.left, .tlTimeOUt.top + .tlTimeOUt.Height + 8, .tlBanner.Width) + '.tlList.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height + 12, .tlBanner.Width) + .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height + 8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height * 5.5) + END WITH END -PUBLIC SUB Button1_Click() -MdlLiloOsList.LIST_LILO_OS_CHOICES - 'ME.Hide - 'FrmLiloOsList.Show - -END PUBLIC SUB FBResolution_Click() DIM box AS TextBox @@ -92,7 +112,7 @@ FOR EACH box IN MdlLiloOsList.txtAppends 'box.Enabled = FALSE box.text = Replace(box.text, "splash=silent", "") '"Not available in \'Standard\' resolution mode" - box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12 + box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12 NEXT ELSE @@ -106,7 +126,7 @@ END IF END IF - box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12 + box.Width = box.Parent.Width - MdlLiloOsList.iAppendLeft - 12 NEXT END IF Modified: branches/iVL/FrmLilo.form ============================================================================== --- branches/iVL/FrmLilo.form (original) +++ branches/iVL/FrmLilo.form Fri Aug 8 12:24:44 2008 @@ -1,7 +1,7 @@ # Gambas Form File 2.0 { Form Form - MoveScaled(0,0,64,61) + MoveScaled(0,0,70,69) Text = ("") { tlBanner TextLabel MoveScaled(1,1,58,4.5) @@ -12,17 +12,17 @@ Text = ("Don't Install Lilo") } { TabStrip1 TabStrip - MoveScaled(1,31,61,22) + MoveScaled(1,38,61,28) Index = 0 Text = ("Tab 0") Index = 0 } { tlList TextLabel - MoveScaled(1,22,57,6) + MoveScaled(1,26,57,6) Text = ("TextLabel1") } { LiloTarget ComboBox - MoveScaled(13,9,39,3.125) + MoveScaled(13,9,31,3.125) Text = ("") ReadOnly = True List = [] @@ -36,9 +36,22 @@ Text = ("Video Resolution") } { FBResolution ComboBox - MoveScaled(20,14,32,3.125) + MoveScaled(20,14,21,3.125) Text = ("") ReadOnly = True List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"), ("Bootsplash Extra high")] + } + { tlTimeOUt TextLabel + MoveScaled(1,20,18,3.125) + Text = ("Prompt Timeout") + Alignment = Align.Normal + } + { sbTimer SpinBox + MoveScaled(20,20,9,3) + } + { tlTimoutSec TextLabel + MoveScaled(30,20,7,3.125) + Text = ("Seconds") + Alignment = Align.Normal } } Modified: branches/iVL/MdlConfLilo.module ============================================================================== --- branches/iVL/MdlConfLilo.module (original) +++ branches/iVL/MdlConfLilo.module Fri Aug 8 12:24:44 2008 @@ -48,153 +48,14 @@ END +PUBLIC SUB WRITE_LILO_DOT_CONF() +DIM sFile AS String +DIM sEntryLbl, sEntryApnd, sEntryRoot, sEntryInitrd AS String + + + +END - -' PUBLIC SUB LIST_BULK_SELECTION() -' -' DIM cb AS CheckBox -' DIM i, ii, cby AS Integer -' DIM sFIle AS String[] -' DIM sCurrLine AS String[] -' DIM sLine, sPkg, sDesc AS String -' DIM vsize AS Variant -' DIM isize AS Integer -' -' cby = 4 -' -' Vmlinuz = NEW Object[] -' -' sFIle = Split(File.Load(Temp("SETUP.CONF")), gb.NewLine) -' FOR i = 0 TO sFIle.count - 1 -' sLine = Trim(sFIle[i]) -' IF Left(sLine, Len("BULK")) = "BULK" THEN -' sCurrLine = Split(sLine, ":") -' 'line format is File_name.tlz:Size_kb:Description -' sPkg = sCurrLine[0] -' sDesc = sCurrLine[2] -' vsize = sCurrLine[1] -' IF InStr(sDesc, "\'") THEN -' sDesc = Left(sDesc, Len(sDesc) - 1) -' END IF -' IF InStr(sPkg, "optional/") THEN -' -' cb = NEW CheckBox(FrmPkgSel.scrlInstallOpts) AS "Linux " -' WITH cb -' .Text = sDesc & Space(1) & "[ " & CStr(vsize) & " KB ]" -' .Width = MdlObjSizer.get_object_width(.Text) + 24 -' .x = 4 -' .y = cby -' .Height = 27 -' .Tag = Right(sPkg, Len(sPkg) - InStr(sPkg, "=") - 1) -' .Value = TRUE -' END WITH -' ME.Vmlinuz.Add(cb) -' cby = cby + cb.Height + 4 -' END IF -' END IF -' NEXT -' -' END -' -' PUBLIC FUNCTION WRITE_LILOCONF() AS Integer -' -' DIM sEntry AS String -' DIM sPartition AS String -' DIM sMountPoint AS String -' DIM sMntOpts AS String -' DIM i AS Integer -' DIM sWinPart AS String -' DIM sLilo AS String -' -' FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/lilo.conf to system" -' -' sLilo = "# LILO configuration file" & -' "#generated by vliloconf" & -' "#" & -' "#Start LILO global section" & -' -' sLilo = sLilo & gb.NewLine & -' "boot = " & $LILO_TARGET -' "DEFAULT = linux" -' "prompt" & -' "timeout = 100" & -' "#Override dangerous defaults that rewrite the partition table:" & -' "change - rules" & -' " reset" & -' "compact" & -' "bitmap = /boot/bitmap/boot.bmp" & -' -' -' ClsPartSel.sRoot & " / " & LCase(ClsPartSel.fRoot) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fRoot)) & " 0 1" & gb.NewLine -' -' IF ClsPartSel.sTmp THEN -' sFstab = sFstab & gb.NewLine & ClsPartSel.sTmp & " /tmp " & LCase(ClsPartSel.fTmp) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fTmp)) & " 0 2 " -' END IF -' -' sLilo = sLilo & "\n\n" & -' "#VESA framebuffer console @ $CONSOLETYPE" & -' "vga = $CONSOLENUM" & -' "#Normal VGA console" & -' "#vga = normal" & -' "#VESA framebuffer console @ 1024 x768x64k" & -' "#vga = 791" & -' "#VESA framebuffer console @ 1024 x768x32k" & -' "#vga = 790" & -' "#VESA framebuffer console @ 1024 x768x256" & -' "#vga = 773" & -' "#VESA framebuffer console @ 800 x600x64k" & -' "#vga = 788" & -' "#VESA framebuffer console @ 800 x600x32k" & -' "#vga = 787" & -' "#VESA framebuffer console @ 800 x600x256" & -' "#vga = 771" & -' "#VESA framebuffer console @ 640 x480x64k" & -' "#vga = 785" & -' "#VESA framebuffer console @ 640 x480x32k" & -' "#vga = 784" & -' "#VESA framebuffer console @ 640 x480x256" & -' "#vga = 769" & -' "# END LILO global section" & -' -' -' sLilo = sLilo & "\n" -' -' 'Message(sLilo) -' -' IF NOT ClsGlobal.sTargetMnt OR ClsGlobal.sTargetMnt = "" THEN -' ClsGlobal.sTargetMnt = "/mnt/target" -' END IF -' -' ';Message(ClsGlobal.sTargetMnt &/ "etc") -' ' now save the file to /etc/fstab -' IF Exist(ClsGlobal.sTargetMnt &/ "etc") = FALSE THEN -' MKDIR ClsGlobal.sTargetMnt &/ "etc" -' END IF -' File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf", SConv(sLilo)) -' 'CATCH -' 'PRINT ERROR -' '.RETURN 1 -' 'RETURN 0 -' -' PUBLIC FUNCTION fFind_WIN() AS String -' 'PARTS = SHELL "fdisk-l | grep -E '^/dev/.* \* .*(FAT32|HPFS|NTFS|Win)' | cut -f 1 -d ' '" -' index = "" -' FOR PART IN $PARTS; DO -' let count1 = count1 + 1 -' LILO1_PART[$count1] = "$PART" -' LILO1_LABEL[$count1] = "Win$index" -' LILO1_DESC[$count1] = "Windows ($PART)" -' IF ["$index"]; THEN -' let index = $index + 1 -' ELSE -' index = 1 -' fi -' done -' -' ENDIF -' -' -' END Modified: branches/iVL/MdlCore.module ============================================================================== --- branches/iVL/MdlCore.module (original) +++ branches/iVL/MdlCore.module Fri Aug 8 12:24:44 2008 @@ -211,7 +211,11 @@ 'FMain.tvPlan.MoveTo("Prep0") FMain.tvPlan["Prep0"].Selected = TRUE 'Balloon("Scanning drives for media ... please wait", fmain.pnlWinHost) + +RETURN FrmSelISO.tlDistroDesc.Text = "<b>Scanning system for installable media. Please wait ...</b>" + + WAIT 1 FrmSelISO.lstInstallableImg.Enabled = FALSE Modified: branches/iVL/MdlDiskPart.module ============================================================================== --- branches/iVL/MdlDiskPart.module (original) +++ branches/iVL/MdlDiskPart.module Fri Aug 8 12:24:44 2008 @@ -43,7 +43,7 @@ aHandle = Desktop.Find(sWons[i]) IF aHandle.Count = 0 THEN REPEAT - WAIT 2 + WAIT 3 INC i aHandle = Desktop.Find(sWons[i]) UNTIL Modified: branches/iVL/MdlLiloOsList.module ============================================================================== --- branches/iVL/MdlLiloOsList.module (original) +++ branches/iVL/MdlLiloOsList.module Fri Aug 8 12:24:44 2008 @@ -21,6 +21,7 @@ PUBLIC txtNames AS Object[] PUBLIC iAppendLeft AS Integer PUBLIC cbWins AS Object[] +PUBLIC bVlCliOption AS Boolean PUBLIC SUB LIST_WIN_INSTALL_CHOICES(iCurrentTabCnt AS Integer) DIM sFatList AS String @@ -84,7 +85,7 @@ .Value = TRUE END WITH END WITH ' end jacking with the tabstrip - + NEXT END IF SHELL "fdisk -l| grep -E \'^/dev/.* \\* .*(FAT32|HPFS|NTFS|Win)\' | cut -f 1 -d \' \'" TO sNTFSLst sNTFSLst = Trim(sNTFSLst) @@ -203,17 +204,18 @@ txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox" WITH txtAppnd - .Move(tl.Left + tl.Width + 8, tl.top, tl.Width) - IF FrmLilo.sVidMode <> "Standard" THEN - .Enabled = TRUE - .text = .text & " splash=silent" - .Width = FrmLilo.TabStrip1.Width - tl.Width - ELSE - '.Enabled = FALSE - '.Text = "not available in \'Standard\' Resolution mode" - .Text = .text & Replace(.text, "splash=silent", "") - .Width = FrmLilo.TabStrip1.Width - tl.Width - END IF + .Move(tl.Left + tl.Width + 8, tl.top, FrmLilo.TabStrip1.Width - (tl.Width * 1.5)) + '.Width = FrmLilo.TabStrip1.Width - tl.Width - (tl.left * 4) + ' IF FrmLilo.sVidMode <> "Standard" THEN + ' .Enabled = TRUE + ' .text = .text & " splash=silent" + ' '.Width = FrmLilo.TabStrip1.Width - tl.Width - (tl.left * 4) + ' ELSE + ' '.Enabled = FALSE + ' '.Text = "not available in \'Standard\' Resolution mode" + ' .Text = .text & Replace(.text, "splash=silent", "") + ' ' .Width = FrmLilo.TabStrip1.Width - tl.Width - (tl.left * 2) + ' END IF .Height = 27 txtAppends.Add(txtAppnd) END WITH @@ -230,6 +232,7 @@ .Height = 27 .Move(4, tl.top + tl.Height + 12) END WITH + END IF END IF @@ -256,6 +259,14 @@ END + +PUBLIC SUB VlCliOption_click() + + bVlCliOption = LAST.value + PRINT bVlCliOption + +END + PUBLIC SUB IncludeOs_click() IF LAST.value = FALSE THEN |