[tuxdroid-svn] r5208 - software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_br
Status: Beta
Brought to you by:
ks156
|
From: jerome <c2m...@c2...> - 2009-07-28 13:01:18
|
Author: jerome
Date: 2009-07-28 15:00:59 +0200 (Tue, 28 Jul 2009)
New Revision: 5208
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.dcu
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.dcu
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Removed balloon timeout to make use of the default one.
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.dcu
===================================================================
(Binary files differ)
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-28 12:41:18 UTC (rev 5207)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas 2009-07-28 13:00:59 UTC (rev 5208)
@@ -6,7 +6,7 @@
ShellAPI, Registry, SysUtils, Variants, Classes, TlHelp32, LibXmlParser,
LibXmlComps, ComCtrls, StdCtrls, OleCtrls, Controls, Windows,
EmbeddedWB, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
- IdHTTP, dialogs;
+ IdHTTP, dialogs, Forms;
function DownloadHTTP(const AUrl : string): string;
function getStates(var values : TStringList): boolean;
@@ -18,7 +18,7 @@
function getUserLanguage() : String;
function toggleMute() : boolean;
function stopServer() : boolean;
- function startServer() : boolean;
+ function startServer(aApplication : TApplication) : boolean;
procedure initKnowedVars();
procedure parseStates(aString : string; var values : TStringList);
function getResult(request : string) : boolean;
@@ -312,7 +312,7 @@
{#### This function start the server and wait until tuxdroid server process is detected ####}
-function startServer() : boolean;
+function startServer(aApplication : TApplication) : boolean;
var
temp : TStringList;
timeout : Integer;
@@ -338,6 +338,7 @@
begin
sleep(1000);
timeout := timeout - 1 ;
+ aApplication.ProcessMessages;
end;
result := TuxUtils.isTuxDroidServerStarted() and TuxUtils.getStates(temp);
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
===================================================================
(Binary files differ)
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-28 12:41:18 UTC (rev 5207)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-07-28 13:00:59 UTC (rev 5208)
@@ -175,9 +175,6 @@
procedure TForm1.FormCreate(Sender: TObject);
begin
- Form1.updateCaptions;
- application.ProcessMessages;
-
url := 'http://127.0.0.1:270/user/';
started := false;
@@ -206,7 +203,7 @@
if not TuxUtils.isTuxDroidServerStarted() then
begin
Form1.ShowBalloonTips(gettext(SERVER_INITIALIZATION));
- TuxUtils.startServer();
+ TuxUtils.startServer(Application);
Form1.ShowBalloonTips(gettext(SERVER_READY));
end;
@@ -584,7 +581,6 @@
IconData.uFlags := NIF_INFO;
TipInfo := mess;
strPLCopy(IconData.szInfo, TipInfo, SizeOf(IconData.szInfo) - 1);
- IconData.DUMMYUNIONNAME.uTimeout := 2000;
TipTitle := gettext(TUX_BOX_WARNING_MSG);
strPLCopy(IconData.szInfoTitle, TipTitle, SizeOf(IconData.szInfoTitle) - 1);
IconData.dwInfoFlags := NIIF_INFO; //NIIF_ERROR; //NIIF_WARNING;
|