From: <cod...@go...> - 2009-04-13 15:17:18
|
Author: M0...@gm... Date: Mon Apr 13 08:13:48 2009 New Revision: 530 Added: branches/speedy/Conf2.class branches/speedy/Conf2.form branches/speedy/Conf3.class branches/speedy/Conf3.form Modified: branches/speedy/.lang/.pot branches/speedy/.project Log: - Finished root password setup - Start user accounts setup. Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Mon Apr 13 08:13:48 2009 @@ -154,6 +154,77 @@ msgid "UTC" msgstr "" +#: Conf2.class:24 +msgid "" +"The linux root account is pre-defined to be used as the system " +"administrator's account. " +msgstr "" + +#: Conf2.class:24 +msgid "" +"This account is used to perform system-wide changes such as adding / " +"removing software, system-qide updates, managing user accounts, etc." +msgstr "" + +#: Conf2.class:24 +msgid "Most oter every-day tasks do not require administrative priviledges." +msgstr "" + +#: Conf2.class:24 +msgid "" +"For added security, use a password that is easy for you to remember, but " +"hard for others to guess." +msgstr "" + +#: Conf2.class:24 +msgid "DO NOT LEAVE THIS BLANK" +msgstr "" + +#: Conf2.class:56 +msgid "Passwords do not match. Please enter the same password twice" +msgstr "" + +#: Conf2.class:62 +msgid "Password was not set. See error log below" +msgstr "" + +#: Conf2.class:116 +msgid "System Administrator Account" +msgstr "" + +#: Conf2.class:133 +msgid "About the linux root account" +msgstr "" + +#: Conf2.class:165 +msgid "Enter Passwrord" +msgstr "" + +#: Conf2.class:182 +msgid "Re-enter Password" +msgstr "" + +#: Conf3.class:22 +msgid "Create as many user accounts as you want / need here." +msgstr "" + +#: Conf3.class:22 +msgid "Choose a unique login name for each user account." +msgstr "" + +#: Conf3.class:26 +msgid "When finished, Click" +msgstr "" + +#: Conf3.class:26 Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72 +#: Step5.class:177 +msgid "to continue" +msgstr "" + +#: Conf3.class:70 +msgid "Create User Accounts" +msgstr "" + #: FMain.class:253 FMain0.class:253 msgid "Process Overview" msgstr "" @@ -683,10 +754,6 @@ #: Step3a1a.class:177 msgid "Partitioning stage complete. Click" -msgstr "" - -#: Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72 Step5.class:177 -msgid "to continue" msgstr "" #: Step3a1a.class:186 Modified: branches/speedy/.project ============================================================================== --- branches/speedy/.project (original) +++ branches/speedy/.project Mon Apr 13 08:13:48 2009 @@ -1,7 +1,7 @@ # Gambas Project File 2.0 # Compiled with Gambas 2.12 Title=VectorLinux Installer -Startup=MdlStartUp +Startup=Conf3 Version=0.0.2 Library=gb.gtk Library=gb.form Added: branches/speedy/Conf2.class ============================================================================== --- (empty file) +++ branches/speedy/Conf2.class Mon Apr 13 08:13:48 2009 @@ -0,0 +1,78 @@ +' Gambas class 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 Form_Open() + + WITH ME + .tlbanner.Text = "<b>" & .tlbanner.Text & "</b>" + .TextLabel1.Text = ("The linux root account is pre-defined to be used as the system administrator's account. ")& + ("This account is used to perform system-wide changes such as adding / removing software, system-qide updates, managing user accounts, etc.") & "<br><br>" & + ("Most oter every-day tasks do not require administrative priviledges.") & "<br>" & "<br>" & + ("For added security, use a password that is easy for you to remember, but hard for others to guess.") & "<br><br>" & ("DO NOT LEAVE THIS BLANK") + END WITH + +END + +PUBLIC SUB Form_Resize() + + hbox2.Width = hbox2.Parent.Width - (hbox2.Left * 2) + +END +PUBLIC FUNCTION GetNext() AS String + + RETURN "Conf3" + + +END +PUBLIC SUB StartUp() + + ClsGlobal.fRunningMainForm.btnext.enabled = Len(textbox1.Text) > 0 + +END + +PUBLIC SUB OnExit() + + IF compare_passwords() = FALSE THEN RETURN + +END + +PUBLIC FUNCTION compare_passwords() AS Boolean + 'DIM hlproc AS Process + DIM sRes AS String + IF textbox1.Text <> textbox2.Text THEN + Message.Error(("Passwords do not match. Please enter the same password twice")) + STOP EVENT + RETURN FALSE + ELSE + SHELL "chroot /mnt/target /sbin/passwdx root " & Trim(textbox1.Text) & " || echo ERROR" TO sRes + IF InStr(sRes, "ERROR") THEN + Message.Error(("Password was not set. See error log below") & "<br>" & Trim(sRes)) + RETURN FALSE + STOP EVENT + END IF + END IF + textbox1.Clear + textbox2.Clear +END + + + + +PUBLIC SUB TextBox2_KeyRelease() + + ClsGlobal.fRunningMainForm.btnext.enabled = textbox2.Text = textbox1.Text + +END Added: branches/speedy/Conf2.form ============================================================================== --- (empty file) +++ branches/speedy/Conf2.form Mon Apr 13 08:13:48 2009 @@ -0,0 +1,81 @@ +# Gambas Form File 2.0 + +{ Form Form + MoveScaled(0,0,78,47) + Text = ("") + Arrangement = Arrange.Row + Padding = 2 + { HPanel1 HPanel + MoveScaled(0,0,60,5) + Expand = True + { tlbanner TextLabel + MoveScaled(12,0,33,3) + Expand = True + Text = ("System Administrator Account") + } + { Separator1 Separator + MoveScaled(13,4,25,1) + Expand = True + } + } + { HBox1 HBox + MoveScaled(0,5,6,2) + Expand = True + } + { Frame1 Frame + MoveScaled(1,8,74,23) + Expand = True + Text = ("About the linux root account") + { HBox2 HBox + MoveScaled(1,2,71,19) + Spacing = 4 + Padding = 2 + { PictureBox1 PictureBox + MoveScaled(1,3,6,12) + Picture = Picture["icon:/32/warning"] + Alignment = Align.Center + } + { TextLabel1 TextLabel + MoveScaled(10,2,58,12) + Expand = True + Text = ("") + } + } + } + { HBox5 HBox + MoveScaled(2,31,15,2) + Expand = True + } + { HPanel2 HPanel + MoveScaled(1,34,72,11) + Expand = True + { TextLabel2 TextLabel + MoveScaled(1,1,20,3.5) + Text = ("Enter Passwrord") + Alignment = Align.Left + } + { TextBox1 TextBox + MoveScaled(21,1,35,3.5) + Text = ("") + Password = True + } + { HBox3 HBox + MoveScaled(57,2,13,1) + Expand = True + } + { TextLabel3 TextLabel + MoveScaled(1,5,20,3.5) + Text = ("Re-enter Password") + Alignment = Align.Left + } + { TextBox2 TextBox + MoveScaled(21,5,35,3.5) + Text = ("") + Password = True + } + { HBox4 HBox + MoveScaled(57,6,13,1) + Expand = True + } + } +} Added: branches/speedy/Conf3.class ============================================================================== --- (empty file) +++ branches/speedy/Conf3.class Mon Apr 13 08:13:48 2009 @@ -0,0 +1,43 @@ +' Gambas class 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 Form_Open() + + WITH ME + .tlbanner.Text = "<b>" & tlbanner.Text & "</b>" + .tlTxt.Text = ("Create as many user accounts as you want / need here.") & "<br>" & + ("Choose a unique login name for each user account.") & "<br><br>" ' + ' --- only if running embedded --- ' + IF ClsGlobal.fRunningMainForm THEN + .tlTxt.Text = tlTxt.Text & + ("When finished, Click") & Space(1) & "\"" & ClsGlobal.fRunningMainForm.btnext.text & "\"" & Space(1) & ("to continue") + END IF + END WITH + +END +PUBLIC SUB OnExit() + + + +END +PUBLIC SUB StartUp() + + + +END + + + Added: branches/speedy/Conf3.form ============================================================================== --- (empty file) +++ branches/speedy/Conf3.form Mon Apr 13 08:13:48 2009 @@ -0,0 +1,35 @@ +# Gambas Form File 2.0 + +{ Form Form + MoveScaled(0,0,72,48) + Text = ("") + Arrangement = Arrange.Row + { HPanel1 HPanel + MoveScaled(0,0,60,5) + Expand = True + { tlbanner TextLabel + MoveScaled(12,0,33,3) + Expand = True + Text = ("Create User Accounts") + } + { Separator1 Separator + MoveScaled(13,4,25,1) + Expand = True + } + } + { HBox1 HBox + MoveScaled(0,5,7,2) + Expand = True + } + { HBox2 HBox + MoveScaled(0,7,71,12) + Expand = True + Padding = 2 + { tlTxt TextLabel + MoveScaled(1,0,15,11) + Expand = True + Text = ("") + Alignment = Align.Left + } + } +} |