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

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

Author: jerome
Date: 2009-09-09 16:44:47 +0200 (Wed, 09 Sep 2009)
New Revision: 5344

Modified:
   software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Commented functions that will not be used for now.

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-09-09 14:13:10 UTC (rev 5343)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas	2009-09-09 14:44:47 UTC (rev 5344)
@@ -245,6 +245,11 @@
   hardwareTestCount := 1;
 
   TuxUtils.initKnowedVars();
+
+  //TB Removed after 30th September release.
+  CheckSendReport.Checked := False;
+  CheckSendReport.Visible := False;
+  LabelSendReport.Visible := False;
 end;
 
 
@@ -407,113 +412,109 @@
   attitunePlayed : boolean;
 begin
   //Checking current step and starting test.
-  if Steps.ActivePageIndex = 4 then
-    begin
-      Form1.Enabled := false;
-      setExitEnabled(false);
-      setNextEnabled(false);
-      setPreviousEnabled(false);
-      try
+  Form1.Enabled := false;
+  setExitEnabled(false);
+  setNextEnabled(false);
+  setPreviousEnabled(false);
+  try
 
-        //Getting attitune play time.
-        if fileExists(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2') then
-          begin
-            try
-              times := TStringList.Create;
-              times.LoadFromFile(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2');
-              time := strtoint(times.Values[gnugettext.GetCurrentLanguage()]);
-              times.Free;
-            except on e : Exception do
-              time := 10;
-            end;
-          end
-        else
-          begin
-          //define a defaulit.
+  //Getting attitune play time.
+    if fileExists(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2') then
+      begin
+        try
+          times := TStringList.Create;
+          times.LoadFromFile(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2');
+          time := strtoint(times.Values[gnugettext.GetCurrentLanguage()]);
+          times.Free;
+        except on e : Exception do
           time := 10;
-          end;
+        end;
+      end
+    else
+      begin
+      //define a defaulit.
+      time := 10;
+      end;
 
-        //Playing Attitune only if server is started, dongle connected ,and radio connected.
-        Report.ATTITUNE_READED := TuxUtils.playAttitune(getAttitunePath());
+      //Playing Attitune only if server is started, dongle connected ,and radio connected.
+      Report.ATTITUNE_READED := TuxUtils.playAttitune(getAttitunePath());
 
-        Form1.setNextEnabled(false);
-        setPreviousEnabled(false);
+      Form1.setNextEnabled(false);
+      setPreviousEnabled(false);
 
-        setExitEnabled(false);
-        Form1.Enabled := false;
-        //Sleeping to the attitune end.
-        sleep( ( time + 1 ) * 1000 );
+      setExitEnabled(false);
+      Form1.Enabled := false;
 
-        //Ask user if something was hear
-        result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_1), gettext(YES), gettext(NO));
+      //Sleeping to the attitune end.
+      sleep( ( time + 1 ) * 1000 );
 
-        Form1.setNextEnabled(true);
-        setPreviousEnabled(true);
-        Form1.setExitEnabled(true);
+      //Ask user if something was hear
+      result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_1), gettext(YES), gettext(NO));
 
-        case result of
-          Box.bOk:
+      Form1.setNextEnabled(true);
+      setPreviousEnabled(true);
+      Form1.setExitEnabled(true);
+
+      case result of
+        Box.bOk:
+          begin
+          Steps.ActivePageIndex := 5;
+          Next.Hide;
+          Previous.Hide;
+          NextLabel.Hide;
+          PreviousLabel.Hide;
+          ExitLabel.Caption := gettext(FINISH);
+          Exit.OnMouseUp := FinishButtonClick;
+          ExitLabel.OnMouseUp := FinishButtonClick;
+          end;
+
+        Box.bCancel:
+          begin
+          if testCount < 2 then
             begin
-            Steps.ActivePageIndex := 5;
-            Next.Hide;
-            Previous.Hide;
-            NextLabel.Hide;
-            PreviousLabel.Hide;
-            ExitLabel.Caption := gettext(FINISH);
-            Exit.OnMouseUp := FinishButtonClick;
-            ExitLabel.OnMouseUp := FinishButtonClick;
-            end;
+            result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_2), gettext(OK), gettext(CANCEL));
 
-          Box.bCancel:
-            begin
-            if testCount < 2 then
+            if result = Box.bCancel then
               begin
-              result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_2), gettext(OK), gettext(CANCEL));
-
-              if result = Box.bCancel then
-                begin
-                Steps.ActivePageIndex := 5;
-                Next.Hide;
-                Previous.Hide;
-                NextLabel.Hide;
-                PreviousLabel.Hide;
-                ExitLabel.Caption := gettext(FINISH);
-                Exit.OnMouseUp := FinishButtonClick;
-                ExitLabel.OnMouseUp := FinishButtonClick;
-                end
-              else
-                begin
-                if testCount < 2 then
-                  begin
-                  TuxUtils.stopServer();
-                  sleep(500);
-                  Steps.ActivePageIndex := 1;
-                  Inc(testCount, 1);
-                  NextLabel.Caption := gettext(NEXTB);
-                  Next.OnMouseUp := Form1.NextMouseUp;
-                  NextLabel.OnMouseUp := Form1.NextMouseUp;
-                  end;
-                end;
+              Steps.ActivePageIndex := 5;
+              Next.Hide;
+              Previous.Hide;
+              NextLabel.Hide;
+              PreviousLabel.Hide;
+              ExitLabel.Caption := gettext(FINISH);
+              Exit.OnMouseUp := FinishButtonClick;
+              ExitLabel.OnMouseUp := FinishButtonClick;
               end
             else
               begin
-                AskAndSend();
+              if testCount < 2 then
+                begin
+                TuxUtils.stopServer();
+                sleep(500);
+                Steps.ActivePageIndex := 1;
+                Inc(testCount, 1);
+                NextLabel.Caption := gettext(NEXTB);
+                Next.OnMouseUp := Form1.NextMouseUp;
+                NextLabel.OnMouseUp := Form1.NextMouseUp;
+                end;
               end;
+            end
+          { //30th September.
+            else
+            begin
+            //Ask if user want to send mail and exit application.
+            AskAndSend();
             end;
-          end;
-
-        //Re-validate the form.
-        Form1.Enabled := true;
-      Except
-        setExitEnabled(true);
-        setNextEnabled(true);
-        Form1.Enabled := true;
+          }
+        end;
       end;
 
-    end
-  else
-    begin
-    Steps.ActivePageIndex := 4;
+      //Re-validate the form.
+      Form1.Enabled := true;
+    Except
+      setExitEnabled(true);
+      setNextEnabled(true);
+      Form1.Enabled := true;
     end;
 
   Form1.Enabled := true;
@@ -528,6 +529,7 @@
 var
   command : string;
 begin
+
   if CheckStartTB.Checked then
     begin
     //This function handle the 'Finish' button click.
@@ -536,12 +538,15 @@
     end;
 
     //We provide the time to tuxbox to be started faster.
+
+  { 30th September.
   sleep(1000);
 
   if CheckSendReport.Checked then
     begin
     sendReport(Report.INFO);
     end;
+  }
   Application.Terminate;
 end;