From: <cod...@go...> - 2008-10-30 14:53:31
|
Author: M0E.lnx Date: Thu Oct 30 07:51:45 2008 New Revision: 248 Added: branches/iVL/MdlAlsaConf.module Modified: branches/iVL/.lang/#project.pot branches/iVL/.lang/ClsGlobal.pot branches/iVL/.lang/ClsPartSel.pot branches/iVL/.lang/ClsWinDrives.pot branches/iVL/.lang/FMain.pot branches/iVL/.lang/FrmDiskPart.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/MdlObjSizer.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/.project branches/iVL/FMain.class branches/iVL/FrmAlsaConf.class branches/iVL/FrmAlsaConf.form branches/iVL/MdlCore.module Log: Alsaconf module ready for testing Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/remote/projects/installer/.project +# /home/vluser/devel/installer/.project # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/ClsGlobal.pot ============================================================================== --- branches/iVL/.lang/ClsGlobal.pot (original) +++ branches/iVL/.lang/ClsGlobal.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/ClsGlobal.class +# /home/vluser/devel/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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/ClsPartSel.class +# /home/vluser/devel/installer/ClsPartSel.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/ClsWinDrives.pot ============================================================================== --- branches/iVL/.lang/ClsWinDrives.pot (original) +++ branches/iVL/.lang/ClsWinDrives.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/ClsWinDrives.class +# /home/vluser/devel/installer/ClsWinDrives.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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FMain.class +# /home/vluser/devel/installer/FMain.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -66,39 +66,39 @@ msgid "No" msgstr "" -#: FMain.class:335 +#: FMain.class:379 msgid "has been installed on your computer. Additional system configuration" msgstr "" -#: FMain.class:335 +#: FMain.class:379 msgid "will take place after you reboot your system.Part of this process must be done in text mode." msgstr "" -#: FMain.class:335 +#: FMain.class:379 msgid "Would you like to reboot your computer now?" msgstr "" -#: FMain.class:340 +#: FMain.class:384 msgid "The VectorLinux installer will now exit. Enjoy your new operating system" msgstr "" -#: FMain.class:435 +#: FMain.class:451 msgid "Process Overview" msgstr "" -#: FMain.class:455 +#: FMain.class:471 msgid "Next" msgstr "" -#: FMain.class:461 +#: FMain.class:477 msgid "Back" msgstr "" -#: FMain.class:467 +#: FMain.class:483 msgid "Exit Installation" msgstr "" -#: FMain.class:483 +#: FMain.class:499 msgid "Button1" msgstr "" Modified: branches/iVL/.lang/FrmDiskPart.pot ============================================================================== --- branches/iVL/.lang/FrmDiskPart.pot (original) +++ branches/iVL/.lang/FrmDiskPart.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmDiskPart.class +# /home/vluser/devel/installer/FrmDiskPart.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmPartScheme.pot ============================================================================== --- branches/iVL/.lang/FrmPartScheme.pot (original) +++ branches/iVL/.lang/FrmPartScheme.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmPartScheme.class +# /home/vluser/devel/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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmPartSel.class +# /home/vluser/devel/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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmPkgSel.class +# /home/vluser/devel/installer/FrmPkgSel.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmSelISO.pot ============================================================================== --- branches/iVL/.lang/FrmSelISO.pot (original) +++ branches/iVL/.lang/FrmSelISO.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmSelISO.class +# /home/vluser/devel/installer/FrmSelISO.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmSummary.pot ============================================================================== --- branches/iVL/.lang/FrmSummary.pot (original) +++ branches/iVL/.lang/FrmSummary.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmSummary.class +# /home/vluser/devel/installer/FrmSummary.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmWinDrives.pot ============================================================================== --- branches/iVL/.lang/FrmWinDrives.pot (original) +++ branches/iVL/.lang/FrmWinDrives.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmWinDrives.class +# /home/vluser/devel/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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlCore.module +# /home/vluser/devel/installer/MdlCore.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -104,5 +104,9 @@ #: MdlCore.module:462 msgid "Network Configuration" +msgstr "" + +#: MdlCore.module:463 +msgid "Final Hardware Configuration" msgstr "" Modified: branches/iVL/.lang/MdlDiskPart.pot ============================================================================== --- branches/iVL/.lang/MdlDiskPart.pot (original) +++ branches/iVL/.lang/MdlDiskPart.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlDiskPart.module +# /home/vluser/devel/installer/MdlDiskPart.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/MdlObjSizer.pot ============================================================================== --- branches/iVL/.lang/MdlObjSizer.pot (original) +++ branches/iVL/.lang/MdlObjSizer.pot Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlObjSizer.module +# /home/vluser/devel/installer/MdlObjSizer.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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlPartSel.module +# /home/vluser/devel/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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlPkgSel.module +# /home/vluser/devel/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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlSetup.module +# /home/vluser/devel/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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlSummarize.module +# /home/vluser/devel/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 Thu Oct 30 07:51:45 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlWinDrives.module +# /home/vluser/devel/installer/MdlWinDrives.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.project ============================================================================== --- branches/iVL/.project (original) +++ branches/iVL/.project Thu Oct 30 07:51:45 2008 @@ -1,7 +1,7 @@ # Gambas Project File 2.0 # Compiled with Gambas 2.9.0 Title=VectorLinux Installer -Startup=FrmXconf +Startup=MdlCore Version=0.0.112 Library=gb.gtk Library=gb.form Modified: branches/iVL/FMain.class ============================================================================== --- branches/iVL/FMain.class (original) +++ branches/iVL/FMain.class Thu Oct 30 07:51:45 2008 @@ -330,19 +330,14 @@ MdlNetConf.WRITE_INET() 'offer to reboot here - SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) & ("has been installed on your computer. Additional system configuration") & "<br>" & - ("will take place after you reboot your system.Part of this process must be done in text mode.") & "<br><br>" & - ("Would you like to reboot your computer now?"), ("Yes"), ("No")) - CASE 1 - SHELL "shutdown -r now" - CASE ELSE - 'RETURN - Message.Info(("The VectorLinux installer will now exit. Enjoy your new operating system")) - QUIT ' dirty quit event - 'STOP EVENT - END SELECT + frmNext = FrmAlsaConf ' frmNext = FrmLilo ' this is already done - + + CASE "FrmAlsaConf" + + frmNext = FrmXconf + + END SELECT ' IF frmNext = "" THEN frmNext = FrmSelISO @@ -375,6 +370,27 @@ END + + +PUBLIC SUB END_INSTALLER() + + SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) & ("has been installed on your computer. Additional system configuration") & "<br>" & + ("will take place after you reboot your system.Part of this process must be done in text mode.") & "<br><br>" & + ("Would you like to reboot your computer now?"), ("Yes"), ("No")) + CASE 1 + SHELL "shutdown -r now" + CASE ELSE + RETURN + Message.Info(("The VectorLinux installer will now exit. Enjoy your new operating system")) + QUIT ' dirty quit event + 'STOP EVENT + END SELECT + + +END + + + PUBLIC SUB btback_Click() Modified: branches/iVL/FrmAlsaConf.class ============================================================================== --- branches/iVL/FrmAlsaConf.class (original) +++ branches/iVL/FrmAlsaConf.class Thu Oct 30 07:51:45 2008 @@ -22,15 +22,18 @@ PUBLIC SUB Form_Open() FMain.FrmCurr = ME + +FMain.tvPlan.Current.picture = MdlCore.sDonePic +FMain.tvPlan.MoveNext() +FMain.tvPlan.Current.Picture = MdlCore.sNowPic - - MdlDiskPart.EMBED_ALSA() +' MdlDiskPart.EMBED_ALSA() + MdlAlsaConf.EMBED_ALSACONFIG() WITH ME - .tlBanner.Text = "<b>ALSA Config:</b><br>" & - "Advanced Linux Sound Architecture:" & - "This portion of the setup process allows you to sutup your soundcard for your new operating system." & - "Please use the setup program below to setup the sound system." + .tlBanner.Text = "<b>" & "Advanced Linux Sound Architecture:" & "</b><br>" & + ("This portion of the setup process allows you to sutup your soundcard for your new operating system.") & "<br>" & + ("Please use the setup program below to setup the sound system.") .tlBanner.Adjust END WITH @@ -60,29 +63,20 @@ END + +PUBLIC SUB Form_Menu() + +'MdlAlsaConf.EMBED_ALSACONFIG() + +END + PUBLIC SUB EmbALSA_Close() - DIM bReboot AS Boolean - - FrmDiskPart.tlBanner.Text = "<h3><br>Analyzing system partitioning scheme... Please wait<br>This will take a few seconds...</h3>" - FrmDiskPart.tlBanner.Refresh - FrmDiskPart.tlBanner.Adjust - 'Message("Exiting GParted") - WAIT 1 - - - - ME.Hide - - FrmPartSel.Show - - - - FMain.btnext.Enabled = TRUE - FMain.btnext.ForeColor = Color.Black - FMain.btback.Enabled = TRUE - FMain.btback.ForeColor = Color.Black - FMain.btQuit.Enabled = TRUE - FMain.btQuit.ForeColor = Color.Black - 'END IF + WITH FMain + .btnext.Enabled = TRUE + .btnext.ForeColor = Color.Black + .btback.Enabled = TRUE + .btback.ForeColor = Color.Black + END WITH + END Modified: branches/iVL/FrmAlsaConf.form ============================================================================== --- branches/iVL/FrmAlsaConf.form (original) +++ branches/iVL/FrmAlsaConf.form Thu Oct 30 07:51:45 2008 @@ -4,15 +4,23 @@ MoveScaled(0,0,84,55) Text = ("") Arrangement = Arrange.Vertical - { tlBanner TextLabel - MoveScaled(1,2,81,9) - Text = ("Alsa Config:") + { pnlBanner Panel + MoveScaled(1,1,75,9) + Arrangement = Arrange.Vertical + { tlBanner TextLabel + MoveScaled(1,0,36,6) + Text = ("") + } + { Separator1 Separator + MoveScaled(1,7,13,1) + } } - { VPanel1 VPanel - MoveScaled(1,12,74,48) + { pnlAlsa Panel + MoveScaled(1,9,78,33) Expand = True + Arrangement = Arrange.Horizontal { EmbALSA Embedder - MoveScaled(6,7,76,32) + MoveScaled(0,0,76,32) Expand = True } } Added: branches/iVL/MdlAlsaConf.module ============================================================================== --- (empty file) +++ branches/iVL/MdlAlsaConf.module Thu Oct 30 07:51:45 2008 @@ -0,0 +1,129 @@ +' Gambas module file + +' This file is part of vinstall-ng + +' vinstall-ng is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 2 of the License, or +' (at your option) any later version. + +' vinstall-ng is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. + +' You should have received a copy of the GNU General Public License +' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>. + +PUBLIC SUB EMBED_ALSACONFIG() + + DIM aHandle AS NEW Pointer[] + DIM iHandle AS Integer + DIM i AS Integer = 0 + DIM sDump AS String + + SHELL "chroot /mnt/target /usr/bin/xterm -e alsaconf" + + aHandle = Desktop.Find("alsaconf") + IF aHandle.Count = 0 THEN + REPEAT + WAIT 1 + aHandle = Desktop.Find("*alsaconf") + INC i + UNTIL aHandle.Count > 0 OR i = 3 + END IF + iHandle = aHandle[0] + + TRY FrmAlsaConf.EmbALSA.Embed(iHandle) + CATCH + Message(Error.where & "\n" & Error.Text) + ' Message(("Error trying to launch sound configuration utility")) + 'END IF + + + + + + ' ' ' DIM sWins AS String = "gpartedbin,Gpartedbin" '" GParted, / dev / sda - GParted, / dev / hda - GParted "" + ' ' ' DIM sWons AS String[] = Split(sWins, ",") + ' ' ' DIM sType AS String + ' ' ' DIM sTypes AS String[] + 'DIM sTypeArr AS String[] + 'Desktop.Find("", "GParted") + + ' The window can be found on the Desktop WM_CLASS property which can be seen via the xprop application + ' We may need to implement this method here instead of the win window title method. + + ' For now, try to determine what type of drive thsi is.. + ' The following line will get the first listed drive (/dev/sda or /dev/hda) and use that + ' as a starting point to search for a running instance of gparted + ' ' ' ' SHELL "probedisk | grep -v \'cdrom\' | cut -f 1 -d \'|\'" TO sType + ' ' ' ' stype = Trim(sType) + ' ' ' ' 'Message(sType) + ' ' ' ' IF stype = "" THEN + ' ' ' ' Message.Error(("VectorLinux is unable to determine the type of hard disks on your system.") & " <br>" & + ' ' ' ' ("It is still possible to install VectorLinux on your system, but you need to pre-partition your disks first")) + ' ' ' ' ELSE IF InStr(sType, "\n") > 0 THEN + ' ' ' ' ' more than one type of disk was found... by default, gparted will load using /dev/hda first + ' ' ' ' sType = "/dev/hda" + ' ' ' ' END IF + ' ' ' ' + ' ' ' ' IF Exist("/usr/sbin/gparted") = FALSE THEN + ' ' ' ' Message.Error(("Gparted was not found on this system. Please install gparted and try again")) + ' ' ' ' RETURN + ' ' ' ' END IF + ' ' ' ' + ' ' ' ' FrmDiskPart.tlBanner.Text = "<h3>" & ("Loading gparted ... Please wait") & "</h3>" + ' ' ' ' SHELL "/usr/sbin/gparted" + ' ' ' ' WAIT 1 + ' ' ' ' + ' ' ' ' sTypes = Split(sType, "\n") + ' ' ' ' + ' ' ' ' aHandle = Desktop.Find("", "*parted*", "") + ' ' ' ' i = 0 + ' ' ' ' IF aHandle.Count = 0 THEN 'lets give it a chance to start + ' ' ' ' REPEAT + ' ' ' ' WAIT 1 + ' ' ' ' aHandle = Desktop.Find("", "*parted*", "") + ' ' ' ' INC i + ' ' ' ' UNTIL + ' ' ' ' aHandle.Count > 0 OR i > 5 + ' ' ' ' END IF + ' ' ' ' + ' ' ' ' IF aHandle.count = 0 ' still struggling here + ' ' ' ' 'FOR i = 0 TO sTypes.Count - 1 + ' ' ' ' i = 0 + ' ' ' ' REPEAT + ' ' ' ' aHandle = Desktop.Find(Trim(sTypes[i]) & " - GParted") + ' ' ' ' INC i + ' ' ' ' UNTIL aHandle.coun > 0 OR i = sTypes.Count - 1 + ' ' ' ' END IF + ' ' ' ' + ' ' ' ' IF aHandle.count = 0 THEN + ' ' ' ' aHandle = Desktop.Find("GParted") ' one last attempt + ' ' ' ' END IF + ' ' ' ' + ' ' ' ' + ' ' ' ' IF aHandle.Count = 0 THEN + ' ' ' ' Message(("Setup is unable to successfully run gparted on this system. This may be a sign of ") & "\n" & + ' ' ' ' ("a bad install media. Setup cannot continue.")) + ' ' ' ' RETURN + ' ' ' ' 'END IF + ' ' ' ' + ' ' ' ' ELSE IF aHandle.Count >= 2 THEN + ' ' ' ' Message(("Several windows found. I will take the first one!")) + ' ' ' ' ENDIF + ' ' ' ' 'ELSE + ' ' ' ' iHandle = aHandle[0] + ' ' ' ' + ' ' ' ' 'ENDIF + ' ' ' ' + ' ' ' ' 'TRY embEmbedder.Embed(iHandle) + ' ' ' ' + ' ' ' ' TRY FrmDiskPart.EmbGPARTED.Embed(iHandle) + ' ' ' ' + ' ' ' ' CATCH + ' ' ' ' Message.Error(Error.Text & gb.NewLine & Error.Where) + ' ' ' ' +END + Modified: branches/iVL/MdlCore.module ============================================================================== --- branches/iVL/MdlCore.module (original) +++ branches/iVL/MdlCore.module Thu Oct 30 07:51:45 2008 @@ -460,7 +460,7 @@ .Add("Conf2", ("System Administrator"), sToDopic, "Conf") .Add("Conf3", ("User Accounts"), sToDopic, "Conf") .Add("Conf4", ("Network Configuration"), sToDopic, "Conf") - '.Add("Conf5", ("Hardware Configuration"), sToDoPic, "Conf") + .Add("Conf5", ("Final Hardware Configuration"), sToDoPic, "Conf") END WITH iLeftWidth = 0 iWidth = 0 |