From: <cod...@go...> - 2008-10-10 20:20:18
|
Author: m0e.lnx Date: Fri Oct 10 13:18:39 2008 New Revision: 221 Modified: branches/iVL/.lang/FrmPartScheme.pot branches/iVL/.lang/FrmSelISO.pot branches/iVL/.project branches/iVL/DevLog branches/iVL/FrmLangSel.class branches/iVL/FrmLilo.class branches/iVL/FrmPartScheme.class branches/iVL/FrmSelISO.class branches/iVL/FrmSelISO.form branches/iVL/FrmUserAdd.class branches/iVL/FrmUserAdd.form branches/iVL/MdlInstallSys.module branches/iVL/MdlLiloOsList.module branches/iVL/MdlUsrAdd.module branches/iVL/installer.gambas Log: - Fixed object position issues on LIlo config window and optimized it for 800x600 resolution - Implemented keyboard shortcuts for language selection window - Fixed problem in full install procedure (some packages (optional) were getting ommitted) - Fixed object position / resizing issue with User add form. - Updated Binary Modified: branches/iVL/.lang/FrmPartScheme.pot ============================================================================== --- branches/iVL/.lang/FrmPartScheme.pot (original) +++ branches/iVL/.lang/FrmPartScheme.pot Fri Oct 10 13:18:39 2008 @@ -14,39 +14,39 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FrmPartScheme.class:59 +#: FrmPartScheme.class:61 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:59 +#: FrmPartScheme.class:61 msgid "This option will overwrite any existing data in the selected partitions" msgstr "" -#: FrmPartScheme.class:59 +#: FrmPartScheme.class:61 msgid "Use this option if you already prepared your partitions using the VectorLinux installer" msgstr "" -#: FrmPartScheme.class:68 +#: FrmPartScheme.class:70 msgid "Select this option is you wish to create, more or resize partitions in order to make room for your new VectorLinux installation." msgstr "" -#: FrmPartScheme.class:68 +#: FrmPartScheme.class:70 msgid "This option is the safest choice if you have other existing installations that you wish to keep." msgstr "" -#: FrmPartScheme.class:110 +#: FrmPartScheme.class:112 msgid "Disk Partitioning Options" msgstr "" -#: FrmPartScheme.class:115 +#: FrmPartScheme.class:117 msgid "Use existing disk partitions" msgstr "" -#: FrmPartScheme.class:120 +#: FrmPartScheme.class:122 msgid "Modify my disk partitions to make room for new installation" msgstr "" -#: FrmPartScheme.class:125 +#: FrmPartScheme.class:127 msgid "TextLabel1" msgstr "" Modified: branches/iVL/.lang/FrmSelISO.pot ============================================================================== --- branches/iVL/.lang/FrmSelISO.pot (original) +++ branches/iVL/.lang/FrmSelISO.pot Fri Oct 10 13:18:39 2008 @@ -34,19 +34,19 @@ msgid "Minimum Disk Space Requirements" msgstr "" -#: FrmSelISO.class:232 +#: FrmSelISO.class:236 msgid "No installable images found." msgstr "" -#: FrmSelISO.class:238 +#: FrmSelISO.class:242 msgid "Select which VectorLinux version you wish to install from the list below" msgstr "" -#: FrmSelISO.class:243 +#: FrmSelISO.class:247 msgid "TextLabel1" msgstr "" -#: FrmSelISO.class:248 +#: FrmSelISO.class:252 msgid "Search Again" msgstr "" Modified: branches/iVL/.project ============================================================================== --- branches/iVL/.project (original) +++ branches/iVL/.project Fri Oct 10 13:18:39 2008 @@ -2,7 +2,7 @@ # Compiled with Gambas 2.9.0 Title=VectorLinux Installer Startup=MdlCore -Version=0.0.103 +Version=0.0.104 Library=gb.gtk Library=gb.form Library=gb.debug Modified: branches/iVL/DevLog ============================================================================== --- branches/iVL/DevLog (original) +++ branches/iVL/DevLog Fri Oct 10 13:18:39 2008 @@ -1,4 +1,5 @@ -- Implemented keyboard shortcuts for zoneset list -- Some fixes to the Install window (stalls for a second before the process begins, objects are out of place - as the form loads, but then snap into place when the install begins - \ No newline at end of file +- Fixed object position issues on LIlo config window and optimized it for 800x600 resolution +- Implemented keyboard shortcuts for language selection window +- Fixed problem in full install procedure (some packages (optional) were getting ommitted) +- Fixed object position / resizing issue with User add form. +- Updated Binary \ No newline at end of file Modified: branches/iVL/FrmLangSel.class ============================================================================== --- branches/iVL/FrmLangSel.class (original) +++ branches/iVL/FrmLangSel.class Fri Oct 10 13:18:39 2008 @@ -56,9 +56,21 @@ END -PUBLIC SUB lbLangSel_KeyRelease() - - + +PUBLIC SUB lbLangSel_KeyPress() + + DIM i AS Integer + IF Key.text > "z" OR Key.text < " " THEN RETURN + i = LAST.index + DO + INC i + IF i > LAST.count - 1 THEN i = 0 + IF i = LAST.index THEN RETURN + IF LAST[i].text LIKE Key.Text & "*" THEN + LAST.index = i + RETURN + END IF + LOOP END Modified: branches/iVL/FrmLilo.class ============================================================================== --- branches/iVL/FrmLilo.class (original) +++ branches/iVL/FrmLilo.class Fri Oct 10 13:18:39 2008 @@ -83,6 +83,8 @@ PUBLIC SUB Form_Resize() DIM cbleft, cbwidth AS Integer + DIM tb AS TextBox + DIM tl AS TextLabel WITH ME .tlTarGet.Alignment = Align.Normal @@ -107,9 +109,18 @@ .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 * 8)) + '.TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height + 8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.tlBanner.Height * 8)) + .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height + 8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.TabStrip1.top) - (.YNLiloBox.Height * 10)) + '.TabStrip1.Move(4, .tlList.top + .tlList.Height + 8, .ClientWidth - (.TabStrip1.Left * 2), .ClientHeight - (.TabStrip1.top + (.YNLiloBox.height * 3))) END WITH + FOR EACH tb IN MdlLiloOsList.txtAppends + FOR EACH tl IN MdlLiloOsList.tlappends + IF tb.tag = tl.tag THEN + tb.Move(tl.left + tl.Width + 4, tl.top, ME.TabStrip1.Width - tb.left - 8) + END IF + NEXT + NEXT END Modified: branches/iVL/FrmPartScheme.class ============================================================================== --- branches/iVL/FrmPartScheme.class (original) +++ branches/iVL/FrmPartScheme.class Fri Oct 10 13:18:39 2008 @@ -25,7 +25,9 @@ .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) + .tlChoiceExp.MOVE(4, .rbEditPartitions.top + .rbEditPartitions.Height + 8, .ClientWidth - (.tlChoiceExp.Left * 2), .ClientHeight - .tlChoiceExp.top - .rbEditPartitions.height) + + '.tlChoiceExp.Move(.rbEditPartitions.Left, .rbEditPartitions.top + .rbEditPartitions.Height * 4, .tlBanner.Width - 10) END WITH Modified: branches/iVL/FrmSelISO.class ============================================================================== --- branches/iVL/FrmSelISO.class (original) +++ branches/iVL/FrmSelISO.class Fri Oct 10 13:18:39 2008 @@ -175,13 +175,17 @@ WITH ME '.Reparent(.Parent) '.Resize(.Parent.Width, .Parent.Height) - + .btResCan.Width = MdlObjSizer.get_object_width(.btResCan.text) + 36 ' .btNext.Move(.Left + .Width - .btNext.Width - 8, .top + ME.Height - .btNext.Height - 8) .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) + .btResCan.Move(.ClientWidth - (.btResCan.Width + 4), .hrSep.top + .hrSep.Height + 24) ', MdlObjSizer.get_object_width(.btResCan.text) + 36) + .lstInstallableImg.Move(4, .btResCan.top, .btResCan.Left - (.lstInstallableImg.left * 2)) + '.btResCan.Move(.Left + .Width - .btResCan.Width - 8, .top + .tlBanner.Height + 48, MdlObjSizer.get_object_width(.btResCan.text) + 36) + '.lstInstallableImg.Move(4, .btResCan.top, .ClientWidth - ((.lstInstallableImg.Left * 2) + .btResCan.Left)) + ' .lstInstallableImg.Move(.left + 4, .btResCan.Top, .Width - (.btResCan.Width + 24), 21) + '.tlDistroDesc.Move(.lstInstallableImg.Left * 2, .lstInstallableImg.top + .lstInstallableImg.Height + 48) + .tlDistroDesc.Move(4, .lstInstallableImg.top + .lstInstallableImg.Height + 24, .ClientWidth - (.tlDistroDesc.left * 2), .ClientHeight - (.tldistrodesc.top + .btrescan.height)) '.FullScreen = TRUE END WITH Modified: branches/iVL/FrmSelISO.form ============================================================================== --- branches/iVL/FrmSelISO.form (original) +++ branches/iVL/FrmSelISO.form Fri Oct 10 13:18:39 2008 @@ -5,7 +5,7 @@ Text = ("") FullScreen = True { lstInstallableImg ComboBox - MoveScaled(1,10,45,3.1429) + MoveScaled(1,10,45,3) Text = ("No installable images found.") ReadOnly = True } @@ -14,11 +14,11 @@ Text = ("Select which VectorLinux version you wish to install from the list below") } { tlDistroDesc TextLabel - MoveScaled(1,16,60,22) + MoveScaled(1,16,60,23) Text = ("TextLabel1") } { btResCan Button - MoveScaled(49,10,13,3.1429) + MoveScaled(49,10,13,3) Text = ("Search Again") Picture = Picture["icon:/16/refresh"] } Modified: branches/iVL/FrmUserAdd.class ============================================================================== --- branches/iVL/FrmUserAdd.class (original) +++ branches/iVL/FrmUserAdd.class Fri Oct 10 13:18:39 2008 @@ -19,6 +19,10 @@ PUBLIC iUID AS Integer = 1000 +PRIVATE otl AS Object[] +PRIVATE otb AS Object[] + + PUBLIC SUB Form_Open() Fmain.frmcurr = ME @@ -34,7 +38,22 @@ .btBrowse.Visible = FALSE END WITH 'WAIT 3 - + otl = NEW Object[] + otb = NEW Object[] + WITH otl + .Add(ME.TextLabel2) + .Add(ME.tlRealName) + .Add(ME.TextLabel3) + .Add(ME.TextLabel4) + '.Add(ME.tlRealName) + END WITH + WITH otb + .Add(ME.tbPasswd1) + .Add(ME.tbPasswd2) + .Add(ME.tbRealname) + .Add(ME.tbUsername) + END WITH + MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS() END @@ -135,44 +154,98 @@ PUBLIC SUB Form_Resize() DIM iboxleft AS Integer - DIM iboxwidth AS Integer - + DIM iboxwidth AS Integer = 250 + DIM cb AS CheckBox + DIM icbspace AS Integer + DIM icby AS Integer + DIM tl AS TextLabel + DIM tb AS TextBox + DIM itltop, itlbottom AS Integer + 'iboxleft = 0 + + itltop = tlExp.top + tlExp.Height + 8 + + FOR EACH tl IN otl + tl.Move(4, itltop, MdlObjSizer.get_object_width(tl.text)) + IF tl.Width > iboxleft THEN iboxleft = tl.Left + tl.Width + 8 + itltop = itltop + tl.Height + 4 + 'itlbottom = itltop + tl.Height + 4 + NEXT + FOR EACH tl IN otl + FOR EACH tb IN otb + IF tb.tag = tl.tag THEN tb.Move(iboxleft, tl.top, iboxwidth) + NEXT + NEXT + + FOR EACH tb IN otb + IF tb.tag = "line4" THEN itlbottom = tl.top + tl.Height + 8 + NEXT + WITH ME .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2)) .hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width) .tlExp.Move(4, .hrSep.top + .hrSep.Height + 12, .hrSep.Width) - .TextLabel2.Move(4, .tlExp.top + .tlExp.Height + 8, MdlObjSizer.get_object_width(.TextLabel2.text) * 2.5) - .tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width + 4, .TextLabel2.top, .TextLabel2.Width * 1.25) + - iboxleft = .tbUsername.Left - iboxwidth = .tbUsername.Width - .tlRealName.Move(4, .TextLabel2.top + .TextLabel2.Height + 2, .TextLabel2.Width) - .tbRealname.Move(iboxleft, .tlRealName.top, iboxwidth) - .TextLabel3.Move(4, .tlRealName.top + .tlRealName.Height + 2, .TextLabel2.Width) - .tbPasswd1.Move(iboxleft, .TextLabel3.top, iboxwidth) - .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.height + 2, MdlObjSizer.get_object_width(.TextLabel4.text)) - .tbPasswd2.Move(iboxleft, .TextLabel4.top, iboxwidth) - '.tlUserID.Move(4, .TextLabel4.top + .TextLabel4.Height + 2, .TextLabel2.Width) - '.cbUserID.Move(iboxleft, .tlUserID.top, iboxwidth * 0.45) - '.tbUsrID.Move(.cbUserID.Left + .cbUserID.Width + 4, .cbUserID.top, iboxwidth - (.cbUserID.Width + 4)) - .bUsePic.Move(4, .tbPasswd2.top + .tbPasswd2.Height + 4, MdlObjSizer.get_object_width(.bUsePic.Text) + 36) - '.tbPicPath.Move(4,.tb - '.bUsePic.Move(4, .tbUsrID.top + .tbUsrID.Height + 8, MdlObjSizer.get_object_width(.bUsePic.Text) + 36) + .bUsePic.Move(4, itlbottom, MdlObjSizer.get_object_width(.bUsePic.Text) + 36) + .tbPicPath.Move(4, .bUsePic.top + .bUsePic.Height + 2, .TextLabel2.Width + iboxwidth + 8) '.tbPicPath.Move(4, .bUsePic.top + .bUsePic.height + 2, .tlBanner.Width - (.btBrowse.Width + 4)) .btBrowse.Move(.tbPicPath.Left + .tbPicPath.Width + 4, .tbPicPath.top, MdlObjSizer.get_object_width(.btBrowse.text) + 36) - .fGroupSel.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientW - (.fGroupSel.Left * 2), .ClientH - (.fGroupSel.top + .Button1.Height)) + .fGroupSel.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientW - (.fGroupSel.Left * 2), .ClientH - (.fGroupSel.top + (.Button1.Height))) .Button1.Move(4, .fGroupSel.top + .fGroupSel.Height + 8, MdlObjSizer.get_object_width(.Button1.Text) + 36) .btClrFrm.Move(.Button1.Left + .Button1.Width + 4, .Button1.top, MdlObjSizer.get_object_width(.btClrFrm.text) + 36) '.pbUsrPic.Move(.tbUsername.Left + (.tbUsername.Width + 2), .tbUsername.top) .pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top) .btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12) + icby = 4 + icbspace = 24 + + FOR EACH cb IN MdlUsrAdd.objGrps + 'icbspace = icbspace + cb.Height + 4 + IF icbspace >= .fGroupSel.Height * 0.75 THEN + icby = icby + 128 + icbspace = 24 + END IF + cb.Move(icby, icbspace) + icbspace = icbspace + cb.Height + 4 + NEXT + + + + + + + ' FOR EACH tl IN otl + ' IF tl.width > iboxleft THEN + ' iboxleft = tl.Left + tl.Width + 8 + ' END IF + ' NEXT + + + 'FOR EACH tb IN otb + + ' ' ' FOR EACH cb IN MdlUsrAdd.objGrps + ' ' ' + ' ' ' 'icbspace = icbspace + cb.Width + 4 + ' ' ' IF icbspace >= .fGroupSel.Width * 0.75 THEN + ' ' ' icby = icby + cb.Height * 2 + ' ' ' icbspace = 4 + ' ' ' END IF + ' ' ' cb.Move(icbspace, icby) + ' ' ' icbspace = icbspace + cb.Width + 4 + ' ' ' + ' ' ' NEXT + + + + - END WITH +END WITH END Modified: branches/iVL/FrmUserAdd.form ============================================================================== --- branches/iVL/FrmUserAdd.form (original) +++ branches/iVL/FrmUserAdd.form Fri Oct 10 13:18:39 2008 @@ -9,26 +9,26 @@ } { tbUsername TextBox MoveScaled(16,18,15,3) + Tag = "line1" Text = ("") } { tbRealname TextBox MoveScaled(17,21,15,3) + Tag = "line2" Text = ("") } { tbPasswd1 TextBox MoveScaled(16,24,16,3) + Tag = "line3" Text = ("") Password = True } { tbPasswd2 TextBox MoveScaled(16,27,16,3) + Tag = "line4" Text = ("") Password = True } - { bUsePic CheckBox - MoveScaled(2,35,45,3) - Text = ("Use Picture ID for Login greeting") - } { tbPicPath TextBox MoveScaled(2,39,55,3) Visible = False @@ -40,6 +40,10 @@ Text = ("Select") Picture = Picture["icon:/16/directory"] } + { bUsePic CheckBox + MoveScaled(2,35,45,3) + Text = ("Use Picture ID for Login greeting") + } { fGroupSel Frame MoveScaled(2,44,69,17) Text = ("User Rights Management") @@ -61,16 +65,19 @@ } { TextLabel2 TextLabel MoveScaled(2,18,12,3) + Tag = "line1" Text = ("Login Name") Alignment = Align.Normal } { TextLabel3 TextLabel MoveScaled(2,24,16,3) + Tag = "line3" Text = ("Enter Password") Alignment = Align.Normal } { TextLabel4 TextLabel MoveScaled(2,27,14,3) + Tag = "line4" Text = ("ReEnter Password") Alignment = Align.Normal } @@ -87,6 +94,7 @@ } { tlRealName TextLabel MoveScaled(2,21,12,3) + Tag = "line2" Text = ("Real Name") Alignment = Align.Normal } Modified: branches/iVL/MdlInstallSys.module ============================================================================== --- branches/iVL/MdlInstallSys.module (original) +++ branches/iVL/MdlInstallSys.module Fri Oct 10 13:18:39 2008 @@ -381,6 +381,8 @@ DIM sPkgName AS String DIM vTargetSize AS Variant + + 'Message("Installing packages") arrFile = Split(sFile, "\n") FOR i = 0 TO arrFile.Count - 1 FrmInstallSys.pbInstallProg.Value = 0 @@ -411,7 +413,7 @@ PRINT sPkgName & " failed to install " RETURN 1 ELSE - RETURN 0 + 'RETURN 0 END IF END IF FrmInstallSys.pbInstallProg.Value = 1 @@ -424,8 +426,9 @@ PRINT sPkgName & " failed to install " RETURN 1 ELSE - RETURN 0 + 'RETURN 0 END IF + 'Message("End Installing Packages") END Modified: branches/iVL/MdlLiloOsList.module ============================================================================== --- branches/iVL/MdlLiloOsList.module (original) +++ branches/iVL/MdlLiloOsList.module Fri Oct 10 13:18:39 2008 @@ -18,6 +18,7 @@ PRIVATE cbarr AS Object[] PRIVATE sText AS String PUBLIC txtAppends AS Object[] +PUBLIC tlappends AS Object[] PUBLIC txtNames AS Object[] PUBLIC txtInitrds AS Object[] PUBLIC iAppendLeft AS Integer @@ -223,6 +224,7 @@ DIM cbInclude AS CheckBox DIM tl AS TextLabel DIM sShortAddr AS String + DIM iwidth AS Integer = FrmLilo.TabStrip1.Width x = 4 y = 4 @@ -231,6 +233,7 @@ txtNames = NEW Object[] txtInitrds = NEW Object[] bIncluded = NEW Object[] +tlappends = NEW Object[] 'FrmLilo.TabStrip1.Count = 1 cbarr = NEW Object[] @@ -331,6 +334,7 @@ .text = "initrd-" & sShortAddr END IF .Visible = FALSE + iwidth = .Width END WITH ME.txtInitrds.Add(txtAppnd) @@ -341,16 +345,19 @@ .Height = 27 .Alignment = Align.Normal .Background = Color.Background - + .tag = arrLinux[i] ME.iAppendLeft = .x + .Width + 4 END WITH - + tlappends.Add(tl) txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox" WITH txtAppnd - .Move(tl.Left + tl.Width + 8, tl.top, tl.Width * 1.25) - + '.Move(tl.Left + tl.Width + 8, tl.top, tl.Width * 1.25) + '.Move(iAppendLeft, tl.top, iwidth - iAppendLeft - 4) + '.Move(4, tl.top + tl.Height + 4, FrmLilo.TabStrip1.Width - (.left * 2)) + '.Move(tl.left + tl.Width + 4, tl.top, tl.Width) + .Move(tl.left + tl.Width + 4, tl.top, tl.Width * 0.5) .Height = 27 .tag = arrLinux[i] txtAppends.Add(txtAppnd) @@ -367,7 +374,8 @@ .text = ("Add option to boot this Operating system into Text mode") .Width = MdlObjSizer.get_object_width(.text) + 36 .Height = 27 - .Move(4, tl.top + tl.Height + 12) + .Move(4, tl.top + tl.Height + 4) + .tag = arrLinux[i] .Background = Color.Background END WITH @@ -390,7 +398,6 @@ NEXT - END Modified: branches/iVL/MdlUsrAdd.module ============================================================================== --- branches/iVL/MdlUsrAdd.module (original) +++ branches/iVL/MdlUsrAdd.module Fri Oct 10 13:18:39 2008 @@ -28,10 +28,8 @@ objGrps = NEW Object[] sGrpArr = Split(sGrpList, ",") -'try to resize the window because the frame is too narrow - WITH FrmUserAdd - .Resize(.Parent.Width, .Parent.Height) - END WITH + + y = 24 Modified: branches/iVL/installer.gambas ============================================================================== Binary files. No diff available. |