Author: jerome
Date: 2009-07-23 23:26:20 +0200 (Thu, 23 Jul 2009)
New Revision: 5154
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:
* Changed the way to stop the server quitting TuxBox 2.0
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-23 20:54:42 UTC (rev 5153)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas
2009-07-23 21:26:20 UTC (rev 5154)
@@ -15,8 +15,9 @@
function isSoundOn(states : TStringList) : boolean;
function isRadioConnected(states : TStringList) : boolean;
function isOnActivity(states : TStringList) : boolean;
-
+ function getUserLanguage() : String;
function toggleMute() : boolean;
+ function stopServer() : boolean;
procedure parseStates(aString : string; var values : TStringList);
@@ -271,4 +272,38 @@
end;
+{#### This function stops the tux droid server. ####}
+function stopServer() : boolean;
+const
+ command_stop = 'http://127.0.0.1:270/0/server/stop?';
+var
+ request_result : string;
+ beginPos, endPos : Integer;
+begin
+ request_result := TuxUtils.DownloadHTTP(command_stop);
+
+ try
+ //Getting the request result <result>.
+ beginPos := Pos('<result>', request_result) + Length('<result>');
+ endPos := Pos('</result>', request_result);
+
+ if Copy(request_result, beginPos, endPos - beginPos) = 'Success' then
+ result := true
+ else
+ result := false;
+ except
+ on e : Exception do
+ result := false;
+ end;
+end;
+
+{#### Gets the current user language. ####}
+function getUserLanguage() : String;
+const
+ command_language = '';
+begin
+ {TODO}
+end;
+
+
end.
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-23 20:54:42 UTC (rev 5153)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
2009-07-23 21:26:20 UTC (rev 5154)
@@ -169,14 +169,19 @@
//Tray menu 'quit' click.
procedure TForm1.Quit1Click(Sender: TObject);
-const
- command = 'tuxhttpserver_stop';
begin
- Shell_NotifyIcon(Nim_DELETE,@tray);
- AppIcon.Free;
- EmbeddedWB1.Free;
- ShellExecute(0, 'open', PChar(command), nil, nil, SW_HIDE) ;
- Application.Terminate;
+ if TuxUtils.stopServer() then
+ begin
+ Shell_NotifyIcon(Nim_DELETE,@tray);
+ AppIcon.Free;
+ EmbeddedWB1.Free;
+ Application.Terminate;
+ end
+ else if TuxUtils.isTuxDroidServerStarted() then
+ begin
+ dialogs.ShowMessage('Can not stop the Tux Droid server' + slinebreak +
+ 'Please, go to start menu to manually stop it.');
+ end;
end;
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
