[Vectorlinux-devel] [vinstall-ng commit] r226 - in branches/iVL: . .lang

[<cod...@go...>]

Author: m0e.lnx
Date: Mon Oct 13 10:15:20 2008
New Revision: 226

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/DevLog
    branches/iVL/FMain.class
    branches/iVL/FrmNetConf.class
    branches/iVL/FrmUserAdd.class

Log:
Moved offer to reboot the system until after the nsetwork configuration  
wizard

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Mon Oct 13 10:15:20 2008
@@ -14,43 +14,59 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:231
+#: FMain.class:226
  msgid "Please wait while setup attampts to run the partitioning utility"
  msgstr ""

-#: FMain.class:233
+#: FMain.class:228
  msgid "Please wait while setup analyses your current partition setup."
  msgstr ""

-#: FMain.class:233
+#: FMain.class:228
  msgid "This may take a while ..."
  msgstr ""

-#: FMain.class:247
+#: FMain.class:242
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr ""

-#: FMain.class:303
+#: FMain.class:298
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:416
+#: FMain.class:327
+msgid "has been installed on your computer."
+msgstr ""
+
+#: FMain.class:327
+msgid "Would you like to reboot your computer now?"
+msgstr ""
+
+#: FMain.class:327
+msgid "Yes"
+msgstr ""
+
+#: FMain.class:327
+msgid "No"
+msgstr ""
+
+#: FMain.class:421
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:436
+#: FMain.class:441
  msgid "Next"
  msgstr ""

-#: FMain.class:442
+#: FMain.class:447
  msgid "Back"
  msgstr ""

-#: FMain.class:448
+#: FMain.class:453
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:464
+#: FMain.class:469
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog	(original)
+++ branches/iVL/DevLog	Mon Oct 13 10:15:20 2008
@@ -1,3 +0,0 @@
-- Fixed milisecond multiplier for LILO conf writer module ( units * 10)
-- Corrected problem with user accounts created without UID value
-- Updated binary

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Mon Oct 13 10:15:20 2008
@@ -32,11 +32,6 @@



-
-
-
-
-
  IF NOT FrmCurr OR FrmCurr = "" THEN FrmCurr = FrmSelISO


@@ -323,9 +318,19 @@


      CASE "FrmNetConf"
-      MdlNetConf.SET_HOSTNAME
-      MdlNetConf.SET_DNS_ADDRESSES
-      MdlNetConf.WRITE_INET
+      MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.text)
+      MdlNetConf.SET_DNS_ADDRESSES()
+      MdlNetConf.WRITE_INET()
+
+          'offer to reboot here
+            SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) &  
("has been installed on your computer.") & "<br>" &
+    ("Would you like to reboot your computer now?"), ("Yes"), ("No"))
+      CASE 1
+        SHELL "shutdown -r now"
+      CASE ELSE
+      RETURN
+      'STOP EVENT
+    END SELECT
  '      frmNext = FrmLilo ' this is already done

    END SELECT

Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class	(original)
+++ branches/iVL/FrmNetConf.class	Mon Oct 13 10:15:20 2008
@@ -42,7 +42,7 @@
    END WITH

      ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()
-    MdlNetConf.LIST_NETWORK_INTERFACES
+    MdlNetConf.LIST_NETWORK_INTERFACES()
      cbUseManDNS.Value = FALSE
      tlBanner.text = "<h3>" & tlBanner.text & "</h3>"


Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Mon Oct 13 10:15:20 2008
@@ -160,14 +160,14 @@
    SHELL "umount /mnt/target/tmp" WAIT
    SHELL "umount /mnt/target/sys" WAIT

-    SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) & ("has been  
installed on your computer.") & "<br>" &
-    ("Would you like to reboot your computer now?"), ("Yes"), ("No"))
-      CASE 1
-        SHELL "shutdown -r now"
-      CASE ELSE
-      RETURN
-      'STOP EVENT
-    END SELECT
+    ' ' ' SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) & ("has  
been installed on your computer.") & "<br>" &
+    ' ' ' ("Would you like to reboot your computer now?"), ("Yes"), ("No"))
+    ' ' '   CASE 1
+    ' ' '     SHELL "shutdown -r now"
+    ' ' '   CASE ELSE
+    ' ' '   RETURN
+    ' ' '   'STOP EVENT
+    ' ' ' END SELECT