[tuxdroid-svn] r5319 - software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-09-01 15:40:26 +0200 (Tue, 01 Sep 2009)
New Revision: 5319

Modified:
   software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
   software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Invalidate form before starting test procedure.
* Updated wait time while starting smart core.

Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm	2009-08-31 13:57:30 UTC (rev 5318)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm	2009-09-01 13:40:26 UTC (rev 5319)
@@ -1,6 +1,6 @@
 object Form1: TForm1
-  Left = 404
-  Top = 131
+  Left = 490
+  Top = 179
   BorderIcons = [biSystemMenu, biMinimize]
   BorderStyle = bsNone
   Caption = 'TuxBox 2.0'

Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas	2009-08-31 13:57:30 UTC (rev 5318)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas	2009-09-01 13:40:26 UTC (rev 5319)
@@ -311,6 +311,7 @@
   //Checking current step and starting test.
   if Steps.ActivePageIndex = 4 then
     begin
+      Form1.Enabled := false;
       setExitEnabled(false);
       setNextEnabled(false);
       setPreviousEnabled(false);
@@ -341,7 +342,7 @@
                 end
               else
                 begin
-                //define a default time to wait.
+                //define a defaulit.
                 time := 10;
                 end;
 
@@ -399,10 +400,7 @@
                         if testCount < 2 then
                           begin
                           TuxUtils.stopServer();
-                          Form1.Enabled := false;
-                          Form1.ShowSplashScreen();
-                          TuxUtils.startServer(Application);
-                          Form1.HideSplashScreen();
+                          sleep(500);
                           Steps.ActivePageIndex := 1;
                           Inc(testCount, 1);
                           NextLabel.Caption := gettext(NEXTB);
@@ -475,17 +473,15 @@
         else
           //Starting the server and Display error message.
           begin
-          Form1.Enabled := false;
-          sleep(4000);
           Form1.ShowSplashScreen();
           TuxUtils.startServer(Application);
           Form1.HideSplashScreen();
           BoxOk1.showMessageDialog(gettext(SERVER_RESTART), gettext(OK));
-          Form1.Enabled := true;
           end;
       Except
         setExitEnabled(true);
         setNextEnabled(true);
+        Form1.Enabled := true;
       end;
 
     end
@@ -494,6 +490,7 @@
     Steps.ActivePageIndex := 4;
     end;
 
+  Form1.Enabled := true;
   setExitEnabled(true);
   setNextEnabled(true);
 end;
@@ -729,19 +726,33 @@
 //Show the splash screen
 procedure TForm1.ShowSplashScreen;
 begin
-  if not Form2.Visible then
+  if not Form4.Visible then
     begin
       Form4.PmGauge1.Progress := 0;
+      sleep(2000);
       Form4.Timer1.Enabled := true;
       Form4.Visible := true;
       Application.ProcessMessages;
+      sleep(1000);
     end;
 end;
 
 //Hide the splash screen
 procedure TForm1.HideSplashScreen;
 begin
+  sleep(2000);
   Form4.Timer1.Enabled := false;
+  Form4.PmGauge1.Progress := 70;
+  Application.ProcessMessages;
+  sleep(2000);
+  Form4.PmGauge1.Progress := 80;
+  sleep(2000);
+  Application.ProcessMessages;
+  Form4.PmGauge1.Progress := 90;
+  sleep(1000);
+  Form4.PmGauge1.Progress := 95;
+  Application.ProcessMessages;
+  sleep(1000);
   Form4.PmGauge1.Progress := 100;
   Sleep(500);
   Form4.Visible := false;