Author: jerome
Date: 2009-07-28 10:44:56 +0200 (Tue, 28 Jul 2009)
New Revision: 5182
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:
* Starting the server and waiting it is completely charged to start TuxBox 2.0
* Updated app icon.
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 08:42:10 UTC (rev 5181)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas
2009-07-28 08:44:56 UTC (rev 5182)
@@ -18,6 +18,7 @@
function getUserLanguage() : String;
function toggleMute() : boolean;
function stopServer() : boolean;
+ function startServer() : boolean;
procedure initKnowedVars();
procedure parseStates(aString : string; var values : TStringList);
function getResult(request : string) : boolean;
@@ -310,6 +311,42 @@
end;
+{#### This function start the server and wait until tuxdroid server process is
detected ####}
+function startServer() : boolean;
+var
+ temp : TStringList;
+ timeout : Integer;
+begin
+ if TuxUtils.isTuxDroidServerStarted() then
+ begin
+ result := true;
+ end
+ else
+ begin
+ //Starting the server.
+ ShellExecute(HWND(nil), 'open', PChar('smart_server_start'), 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 ;
+ end;
+
+ result := TuxUtils.isTuxDroidServerStarted() and
TuxUtils.getStates(temp);
+
+ end;
+ end;
+end;
+
+
{#### Gets the current user language. ####}
function getUserLanguage() : String;
const
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 08:42:10 UTC (rev 5181)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
2009-07-28 08:44:56 UTC (rev 5182)
@@ -157,12 +157,19 @@
url := 'http://127.0.0.1:270/user/';
started := false;
+ //Starting server if not started yet.
+ if not TuxUtils.isTuxDroidServerStarted() then
+ begin
+ TuxUtils.startServer();
+ end;
+
//Setting app icon.
AppIcon := TIcon.Create;
ImageList1.GetIcon(1, AppIcon);
- Application.Icon := AppIcon;
- Form1.Icon := AppIcon;
+ ImageList1.GetIcon(0, Application.Icon);
+ Form1.Icon := Application.Icon;
+
balloonShowed := false;
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
