Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r345 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-02 22:29:19
|
Author: M0...@gm...
Date: Tue Dec 2 14:27:30 2008
New Revision: 345
Modified:
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/FrmImportAccts.class
branches/iVL/FrmResetSettings.class
branches/iVL/FrmResetSettings.form
branches/iVL/MdlResetSettings.module
branches/iVL/installer.gambas
Log:
Added message to inform account has been imported... Fixed bug in account
imported where the copy command produced an error if the file already exists
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -54,47 +54,47 @@
msgid "Not Used"
msgstr ""
-#: FrmSummary.class:58
-msgid "Do not Format"
+#: FrmSummary.class:75
+msgid "Do not format"
msgstr ""
-#: FrmSummary.class:59
-msgid "Yes"
+#: FrmSummary.class:76
+msgid "No"
msgstr ""
-#: FrmSummary.class:61
-msgid "No"
+#: FrmSummary.class:78
+msgid "Yes"
msgstr ""
-#: FrmSummary.class:99
+#: FrmSummary.class:104
msgid "None"
msgstr ""
-#: FrmSummary.class:121
+#: FrmSummary.class:126
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:174
+#: FrmSummary.class:179
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:183
+#: FrmSummary.class:188
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:210
+#: FrmSummary.class:215
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:286
+#: FrmSummary.class:291
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:296
+#: FrmSummary.class:301
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:306
+#: FrmSummary.class:311
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/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 Tue Dec 2 14:27:30 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.19
+Version=0.1.21
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Tue Dec 2 14:27:30 2008
@@ -86,7 +86,8 @@
'RETURN
ME.CREATE_IMPORTED_ACCOUNT
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
-
+ Message.Info(("User account for") & Space(1) &
Trim(ME.cbAccntList.Text) & Space(1) & ("successfully imported"))
+
'ME.Close
'ME.pbLogin.Picture.Image.Clear
END IF
@@ -121,6 +122,7 @@
EXEC ["rm", "-rf", ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
EXEC ["cp", "-r", ClsGlobal.sTargetMnt &/ "etc" &/ "skel" &
Trim(sSettings[i]), ClsGlobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ Trim(sSettings[i])] WAIT
EXEC ["chown", Trim(ME.cbAccntList.Text) & ":users",
ClsGlobal.sTargetMnt &/ "home" &/ Trim(ME.cbAccntList.Text) &/
Trim(sSettings[i])] WAIT
+ IF ERROR THEN Message(Error.Where & gb.NewLine & Error.Text)
NEXT
@@ -131,15 +133,16 @@
SHELL "chroot /mnt/target /usr/sbin/useradd -g " &
Trim(ME.cbAccntList.Text) & " -p " & ME.tbPass1.Text & " -u " &
FrmUserAdd.iUID & " -G " & "\'users," & sGroups & "\' -s /bin/bash "
& 'ME.tbUsername.Text WAIT
Trim(ME.cbAccntList.Text) & " -d /home/" & Trim(ME.cbAccntList.Text) WAIT
SHELL "chroot /mnt/target /sbin/passwdx " & Trim(ME.cbAccntList.Text) &
Space(1) & ME.tbPass1.Text WAIT
-
+ IF ERROR THEN Message.Error(Error.Where & gb.NewLine & Error.Text)
' Add the face icon
IF Len(ME.tbPicPath.Text) > 0 THEN
SHELL "cd " & sPicdir & " && ln -s " &
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) &
Trim(ME.cbAccntList.Text) & ".face.icon" WAIT 'link for KDM
' Tweak for the GDM face icon to work
- COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home" &/
Trim(ME.cbAccntList.Text) &/ ".face"
+ TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"
&/ Trim(ME.cbAccntList.Text) &/ ".face"
SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
Trim(ME.cbAccntList.Text) &/ ".face" WAIT
SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home" &/ Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " &
Trim(ME.cbAccntList.Text) & Space(1) &/ "home/" & Trim(ME.cbAccntList.Text)
&/ ".face" WAIT
+ IF ERROR THEN Message.Error(Error.Where & gb.NewLine &
Error.Text)
END IF
' Increase the value of the iUID
Modified: branches/iVL/FrmResetSettings.class
==============================================================================
--- branches/iVL/FrmResetSettings.class (original)
+++ branches/iVL/FrmResetSettings.class Tue Dec 2 14:27:30 2008
@@ -81,7 +81,7 @@
PUBLIC SUB Form_Resize()
WITH ME
- .tlBanner.Move(4, 4)
+ .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2))
.gvSettings.Move(4, .tlBanner.top + .tlBanner.Height + 4, .ClientWidth
- (.gvSettings.Left * 2), .ClientH - (.gvSettings.Top * 2))
.btDone.Move(4, .gvSettings.Top + .gvSettings.Height + 8,
MdlObjSizer.get_object_width(.btDone.Text) + 36, 21)
'.gvSettings.Columns[1].Width = .gvSettings.Width -
(.gvSettings.Columns[0].Width * 1.25)
Modified: branches/iVL/FrmResetSettings.form
==============================================================================
--- branches/iVL/FrmResetSettings.form (original)
+++ branches/iVL/FrmResetSettings.form Tue Dec 2 14:27:30 2008
@@ -6,8 +6,9 @@
Icon = Picture["icon:/small/undo"]
SkipTaskbar = True
{ tlBanner TextLabel
- MoveScaled(1,1,40,3)
+ MoveScaled(1,1,40,4)
Text = ("Select which settings to reset")
+ Alignment = Align.Normal
}
{ gvSettings GridView
MoveScaled(1,6,63,21)
Modified: branches/iVL/MdlResetSettings.module
==============================================================================
--- branches/iVL/MdlResetSettings.module (original)
+++ branches/iVL/MdlResetSettings.module Tue Dec 2 14:27:30 2008
@@ -32,29 +32,29 @@
SELECT CASE sFile
CASE ".kde"
- sDesc = "KDE Settings (Menu, Window decorations, etc)"
+ sDesc = ("KDE Settings (Menu, Window decorations, etc)")
CASE ".qt"
- sDesc = "QT Toolkit settings (KDE Visual Effects)"
+ sDesc = ("QT Toolkit settings (KDE Visual Effects)")
CASE ".gtkrc-*"
- sDesc = "GTK Tookit theme Settings"
+ sDesc = ("GTK Tookit theme Settings")
CASE ".Xdefaults"
- sDesc = "X-window basic settings (includes xterm settings)"
+ sDesc = ("X-window basic settings (includes xterm settings)")
CASE ".bashrc"
- sDesc = "Bash init script"
+ sDesc = ("Bash init script")
CASE ".asoundrc"
- sDesc = "Sound system preferences"
+ sDesc = ("Sound system preferences")
CASE ".xinitrc"
- sDesc = "Graphical inteface preferences"
+ sDesc = ("Graphical inteface preferences")
CASE "Desktop"
- sDesc = "Desktop icons, folders, launchers"
+ sDesc = ("Desktop icons, folders, launchers")
CASE ".IceWM"
- sDesc = "IceWM settings, preferences, menu"
+ sDesc = ("IceWM settings, preferences, menu")
CASE ".xmms"
- sDesc = "XMMS Audio player preferences"
+ sDesc = ("XMMS Audio player preferences")
CASE ".Choices", "Choices"
- sDesc = "ROX Filer Desktop settings"
+ sDesc = ("ROX Filer Desktop settings")
CASE ".mplayer"
- sDesc = "MPlayer Multimedia Player Settings"
+ sDesc = ("MPlayer Multimedia Player Settings")
CASE ELSE
sDesc = ""
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
