Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r260 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-04 21:14:49
|
Author: M0E.lnx
Date: Tue Nov 4 13:13:31 2008
New Revision: 260
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FMain.form
branches/iVL/FrmDone.class
branches/iVL/FrmLangSel.class
branches/iVL/installer.gambas
Log:
- Restored code to automatically list the translations provided by looking
in .lang
- Modified the way the installer ends. Added final message window instead
of a message.warning
- Added warning right before quietly configuring X letting the user know
that the screen may flicker.
- Updated binary
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Nov 4 13:13:31 2008
@@ -14,91 +14,87 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:205
+#: FMain.class:177
+msgid "Restart"
+msgstr ""
+
+#: FMain.class:211
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:207
+#: FMain.class:213
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:207
+#: FMain.class:213
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:221
+#: FMain.class:227
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:273
+#: FMain.class:279
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:274
+#: FMain.class:280
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:285
+#: FMain.class:291
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:299
+#: FMain.class:305
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:314
+#: FMain.class:320
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:314
+#: FMain.class:320
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:314
+#: FMain.class:320
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:314
+#: FMain.class:320
msgid "Yes"
msgstr ""
-#: FMain.class:314
+#: FMain.class:320
msgid "No"
msgstr ""
-#: FMain.class:389
-msgid "has been installed on your computer. Additional system
configuration"
-msgstr ""
-
-#: FMain.class:389
-msgid "will take place after you reboot your system.Part of this process
must be done in text mode."
-msgstr ""
-
-#: FMain.class:389
-msgid "Would you like to reboot your computer now?"
+#: FMain.class:343
+msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:394
-msgid "The VectorLinux installer will now exit. Enjoy your new operating
system"
+#: FMain.class:343
+msgid "Your screen may flicker or go blank during this process for a few
seconds during this process."
msgstr ""
-#: FMain.class:474
+#: FMain.class:494
msgid "Process Overview"
msgstr ""
-#: FMain.class:495
+#: FMain.class:514
msgid "Next"
msgstr ""
-#: FMain.class:501
+#: FMain.class:520
msgid "Back"
msgstr ""
-#: FMain.class:507
+#: FMain.class:526
msgid "Exit Installation"
msgstr ""
-#: FMain.class:523
+#: FMain.class:542
msgid "Button1"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Nov 4 13:13:31 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.122
+Version=0.0.123
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Tue Nov 4 13:13:31 2008
@@ -1,14 +1,4 @@
-- Re-worked the language selection
- * Changed the listview for a columnview
- \- This will eliminate the need to create an array
- with a long list of languages. Instead, the installer will
- look in it's .lang dir and list all the .mo files, then it
- will populate the columnview using only the languages found.
-
-
-
--I added the non-gui config code to run in the BG when lilo window starts.
- this is how it is done in old installer.
- we still need vhalswitch, ALSA-config(this should be done in xterm IMO),
vxconf, hwinit??, and runlevel??.
- we can skip last 2 IMO
- I added code to mount all needed binds to liloconfig and stoppped
mount/umount in root, and useradd.
\ No newline at end of file
+- Restored code to automatically list the translations provided by looking
in .lang
+- Modified the way the installer ends. Added final message window instead
of a message.warning
+- Added warning right before quietly configuring X letting the user know
that the screen may flicker.
+- Updated binary
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 4 13:13:31 2008
@@ -172,6 +172,12 @@
DIM sDev AS String
DIM sLang AS String
+ tvPlan.Refresh()
+
+ IF LAST.TEXT = ("Restart") THEN
+ EXEC "shutdown -r now"
+ ELSE
+
IF FrmLangSel.Visible = TRUE THEN
ME.Button1_Click()
WAIT
@@ -333,12 +339,17 @@
' CONFIGURE X QUIETLY HERE
+ Message.Warning(("VectorLinux will now try to detect and
configure your graphics hardware.") & "<br>" &
+ ("Your screen may flicker or go blank during this process for a
few seconds during this process."))
+
MdlXconf.QUIET_XORG_CONFIGURATION()
frmNext = FrmDone
CASE "FrmDone"
'offer to reboot here
+
+
ME.END_INSTALLER()
frmNext = FrmAlsaConf
' frmNext = FrmLilo ' this is already done
@@ -376,25 +387,34 @@
WAIT 1
MdlSetup.BEGIN_INSTALLATION()
END IF
-
+END IF
+tvPlan.Refresh()
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
+
+ ' Check for /tmp/status in the target installation
+ IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = FALSE THEN
+ REPEAT
+ WAIT
+ UNTIL Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = TRUE
+ END IF
+
+ ' ' ' ' '
+ ' ' ' ' ' 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
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Tue Nov 4 13:13:31 2008
@@ -9,7 +9,6 @@
{ tvPlan TreeView
MoveScaled(1,2,22,56)
Expand = True
- Mode = Select.None
Border = False
}
}
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Tue Nov 4 13:13:31 2008
@@ -22,9 +22,17 @@
FMain.FrmCurr = ME
tlbanner.text = "<b>" & tlbanner.text & "</b>"
+ FMain.btnext.Text = ("Restart")
+ FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text) + 36
+ FMain.btback.Enabled = FALSE
+ FMain.btback.ForeColor = Color.Gray
+ FMain.btQuit.Text = ("Exit")
+ FMain.btQuit.Width = MdlObjSizer.get_object_width(FMain.btQuit.Text) + 36
WITH ME.tlMsg
.Text = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
- ("After reboot you can use vasm or vasmCC to fine tune your
installation.")
+ ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
+ ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
+ ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
END WITH
END
Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class (original)
+++ branches/iVL/FrmLangSel.class Tue Nov 4 13:13:31 2008
@@ -34,31 +34,31 @@
PUBLIC SUB LIST_LANG_CHOICES()
- WITH ME.lblangsel
- .Add("es_ES", "Spanish")
- .Add("en_US", "US English")
- END WITH
+ ' ' ' ' ' WITH ME.lblangsel
+ ' ' ' ' ' .Add("es_ES", "Spanish")
+ ' ' ' ' ' .Add("en_US", "US English")
+ ' ' ' ' ' END WITH
-' ' DIM sLangCode, sLangName AS String
-' ' DIM i AS Integer
-' '
-' ' i = 0
-' ' FOR EACH sLangCode IN RDir(".lang", "*.mo")
-' ' 'Message(sLangCode)
-' ' SELECT CASE File.BaseName(".lang" &/ sLangCode)
-' ' CASE "en_US"
-' ' sLangName = "US English"
-' ' CASE "es"
-' ' sLangName = "Spanish"
-' ' END SELECT
-' '
-' ' ME.lblangsel.Add(File.BaseName(sLangCode), sLangName)
-' '
-' '
-' ' NEXT
-' '
-' '
+ DIM sLangCode, sLangName AS String
+ DIM i AS Integer
+
+ i = 0
+ FOR EACH sLangCode IN Dir(".lang", "*.mo")
+ 'Message(sLangCode)
+ SELECT CASE File.BaseName(".lang" &/ sLangCode)
+ CASE "en_US"
+ sLangName = "US English"
+ CASE "es"
+ sLangName = "Spanish"
+ END SELECT
+
+ ME.lblangsel.Add(File.BaseName(sLangCode), sLangName)
+
+
+NEXT
+
+
END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
