Author: remi
Date: 2009-07-30 19:19:11 +0200 (Thu, 30 Jul 2009)
New Revision: 5245
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Improved starting speed. The tray icon is now showed when the user page is
available (Before the "TuxBox Ready" attitune)
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas
===================================================================
---
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas
2009-07-30 14:34:52 UTC (rev 5244)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas
2009-07-30 17:19:11 UTC (rev 5245)
@@ -95,7 +95,7 @@
with TIdHTTP.Create(nil) do
try
- ReadTimeout := 1000;
+ ReadTimeout := 500;
try
Get(AUrl, output);
@@ -324,7 +324,7 @@
{#### This function start the server and wait until tuxdroid server process is
detected ####}
function startServer(aApplication : TApplication) : boolean;
var
- temp : TStringList;
+ //temp : TStringList;
timeout : Integer;
begin
if TuxUtils.isTuxDroidServerStarted() then
@@ -335,25 +335,17 @@
begin
//Starting the server.
ShellExecute(HWND(nil), 'open', PChar('smart_server_restart'), nil, nil,
SW_HIDE);
- sleep(1000);
- if TuxUtils.isTuxDroidServerStarted() and TuxUtils.getStates(temp) then
- begin
- result := true;
- end
- else
- begin
- timeout := 20;
- while ( not (TuxUtils.isTuxDroidServerStarted() and
TuxUtils.getStates(temp)) )
- or ( timeout <> 0 ) do
- begin
- sleep(1000);
- timeout := timeout - 1 ;
- aApplication.ProcessMessages;
- end;
-
- result := TuxUtils.isTuxDroidServerStarted() and
TuxUtils.getStates(temp);
-
- end;
+ sleep(500);
+ result := false;
+ timeout := 30;
+ repeat
+ sleep(500);
+ timeout := timeout - 1;
+ result := TuxUtils.userPageIsReady;
+ if result then
+ break;
+ Application.ProcessMessages;
+ until timeout <= 0;
end;
end;
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
===================================================================
---
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
2009-07-30 14:34:52 UTC (rev 5244)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
2009-07-30 17:19:11 UTC (rev 5245)
@@ -61,7 +61,6 @@
Width = 955
Height = 619
TabOrder = 0
- Silent = False
RegisterAsBrowser = True
RegisterAsDropTarget = False
OnDocumentComplete = EmbeddedWB1DocumentComplete
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
===================================================================
---
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
2009-07-30 14:34:52 UTC (rev 5244)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
2009-07-30 17:19:11 UTC (rev 5245)
@@ -245,22 +245,7 @@
//Starting server if not started yet.
if not TuxUtils.isTuxDroidServerStarted() then
- begin
- TuxUtils.startServer(Application);
- end
- else
- begin
- if not TuxUtils.userPageIsReady then
- begin
- TuxUtils.startServer(Application);
- end
- else
- begin
- Sleep(500);
- if not TuxUtils.userPageIsReady then
- TuxUtils.startServer(Application);
- end;
- end;
+ TuxUtils.startServer(Application);
//Show the systray icon
Form1.AddSysTrayIcon;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
