Author: jerome
Date: 2009-09-17 08:36:36 +0200 (Thu, 17 Sep 2009)
New Revision: 5419
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Box.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/BoxOk.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm
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:
* Removed a debug timer.
* Force dialog forms to be displayed foreground.
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Box.pas
===================================================================
---
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Box.pas
2009-09-16 15:13:56 UTC (rev 5418)
+++
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Box.pas
2009-09-17 06:36:36 UTC (rev 5419)
@@ -135,7 +135,7 @@
Form2.setCaptions(okCaption, cancelCaption);
Form2.setMessage(msg);
Form2.Show;
-
+ SetForegroundWindow(Form2.Handle);
while Form2.Visible do
begin
sleep(300);
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/BoxOk.pas
===================================================================
---
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/BoxOk.pas
2009-09-16 15:13:56 UTC (rev 5418)
+++
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/BoxOk.pas
2009-09-17 06:36:36 UTC (rev 5419)
@@ -116,7 +116,7 @@
Form3.setCaptions(okCaption);
Form3.setMessage(msg);
Form3.Show;
-
+ SetForegroundWindow(Form3.Handle);
while Form3.Visible do
begin
sleep(300);
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm
===================================================================
---
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm
2009-09-16 15:13:56 UTC (rev 5418)
+++
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm
2009-09-17 06:36:36 UTC (rev 5419)
@@ -1,6 +1,6 @@
object Form4: TForm4
- Left = 496
- Top = 260
+ Left = 497
+ Top = 261
BorderStyle = bsNone
Caption = 'Form4'
ClientHeight = 107
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-09-16 15:13:56 UTC (rev 5418)
+++
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
2009-09-17 06:36:36 UTC (rev 5419)
@@ -1,6 +1,6 @@
object Form1: TForm1
- Left = 635
- Top = 269
+ Left = 636
+ Top = 219
BorderIcons = [biSystemMenu, biMinimize]
BorderStyle = bsNone
Caption = 'TuxBox 2.0'
@@ -20,7 +20,6 @@
PrintScale = poNone
Scaled = False
Visible = True
- OnActivate = FormActivate
OnClose = FormClose
OnCreate = FormCreate
PixelsPerInch = 96
@@ -6783,11 +6782,4 @@
Left = 184
Top = 336
end
- object Timer1: TTimer
- Enabled = False
- Interval = 60000
- OnTimer = Timer1Timer
- Left = 256
- Top = 352
- end
end
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-16 15:13:56 UTC (rev 5418)
+++
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
2009-09-17 06:36:36 UTC (rev 5419)
@@ -96,7 +96,9 @@
'Please try to re-install the Tux Droid software. In case that
does not ' +
'help please visit our forums or contact customer support.';
+ HID_INSTALL_WAIT = 'Please wait while the dongle is being installed.';
+
type
TForm1 = class(TForm)
IdAntiFreeze1: TIdAntiFreeze;
@@ -149,7 +151,6 @@
LabelLaunch: TLabel;
LabelSendReport: TLabel;
IdSSLIOHandlerSocket1: TIdSSLIOHandlerSocket;
- Timer1: TTimer;
procedure FormCreate(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure ExitButtonClick(down : boolean);
@@ -184,8 +185,6 @@
procedure AskAndSend();
procedure validateButtons();
procedure invalidateButtons();
- procedure Timer1Timer(Sender: TObject);
- procedure FormActivate(Sender: TObject);
@@ -267,8 +266,6 @@
CheckSendReport.Checked := False;
CheckSendReport.Visible := False;
LabelSendReport.Visible := False;
-
- Timer1.Enabled := true;
end;
@@ -327,9 +324,6 @@
{#### Next button clicked ####}
procedure TForm1.NextButtonClick();
-var
- HIDTimeout : Integer;
- HIDCheck : boolean;
begin
//Invalidate buttons
invalidateButtons();
@@ -368,29 +362,8 @@
with TDongleHIDCheck.create(nil) do
begin
invalidateButtons();
- HIDCheck := False;
- HIDTimeout := 0;
- while not HIDCheck do
- begin
- if not ( HIDTimeout >= 60 ) then
- begin
- sleep(1000);
- HIDCheck := Check();
- Application.ProcessMessages();
- Inc(HIDTimeout, 1);
- end;
- end;
- //If detected, sleeping to let Windows finishing install drivers (
needed for low perf computers ).
- sleep(3000);
- //Finally, refreshing states.
- try
- if values <> nil then
- values.Clear;
- TuxUtils.getStates(values);
- sleep(500);
- except
-
- end;
+ if not Check() then
+ BoxOk1.showMessageDialog(gettext(HID_INSTALL_WAIT), gettext(OK));
validateButtons();
end;
@@ -879,6 +852,7 @@
sleep(2000);
Form4.Timer1.Enabled := true;
Form4.Visible := true;
+ SetForegroundWindow(Form4.Handle);
Application.ProcessMessages;
sleep(1000);
end;
@@ -905,26 +879,4 @@
Form4.Visible := false;
end;
-
-//
-procedure TForm1.Timer1Timer(Sender: TObject);
-begin
- if Form1.Tag = 1 then
- begin
- Timer1.Enabled := False;
-
- Form1.BorderStyle := bsNone;
- Application.ProcessMessages;
- sleep(2000);
- Form1.Refresh;
- Form1.Repaint;
- Application.ProcessMessages;
- end;
-end;
-
-procedure TForm1.FormActivate(Sender: TObject);
-begin
- Form1.Tag := 1;
-end;
-
end.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
