Author: remi
Date: 2009-10-16 10:38:37 +0200 (Fri, 16 Oct 2009)
New Revision: 5705
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.pas
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.mo
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.po
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/default.pot
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/en/LC_MESSAGES/default.mo
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/en/LC_MESSAGES/default.po
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/fr/LC_MESSAGES/default.mo
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/fr/LC_MESSAGES/default.po
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/nl/LC_MESSAGES/default.mo
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/nl/LC_MESSAGES/default.po
Log:
* Added a method to check the default audio device.
* If TuxDroid-TTS is detected as default then show a warning popup and finally
show the audio card configuration panel.
* Added message translations (german string must be translated)
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-10-16 08:22:24 UTC (rev 5704)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas
2009-10-16 08:38:37 UTC (rev 5705)
@@ -6,7 +6,7 @@
ShellAPI, Registry, SysUtils, Variants, Classes, TlHelp32, LibXmlParser,
LibXmlComps, ComCtrls, StdCtrls, OleCtrls, Controls, Windows,
EmbeddedWB, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
- IdHTTP, dialogs, Forms;
+ IdHTTP, dialogs, Forms, MMSYSTEM;
function DownloadHTTP(const AUrl : string): string;
function getStates(var values : TStringList): boolean;
@@ -26,6 +26,7 @@
function getResult(request : string) : boolean;
function getRegisteryLanguage(): string;
function getTuxBoxInstallationPath: string;
+ procedure audioDeviceCheck(msg:string);
var
XmlScanner1 : TXmlScanner;
@@ -460,5 +461,32 @@
end;
end;
+procedure audioDeviceCheck(msg:string);
+var
+ i:integer;
+ caps:WaveOutCapsA;
+ devicesList : TStringList;
+ firstDevice : string;
+begin
+ firstDevice := 'None';
+ devicesList := TStringList.Create;
+ for i:=0 to waveOutGetNumDevs-1 do
+ begin
+ waveOutGetDevCapsA(i, @caps, sizeof(caps));
+ devicesList.add(caps.szPname);
+ end;
+ if devicesList.Count > 0 then
+ begin
+ firstDevice := devicesList[0];
+ end;
+ devicesList.Free;
+ if pos('TuxDroid-TTS', firstDevice) <> 0 then
+ begin
+ // Audio card trouble
+ showmessage(msg);
+ WinExec('rundll32 shell32.dll,Control_RunDLL MMSys.cpl,,0', SW_SHOW);
+ end;
+end;
+
end.
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-10-16 08:22:24 UTC (rev 5704)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
2009-10-16 08:38:37 UTC (rev 5705)
@@ -327,6 +327,9 @@
//Start the Connection checker
ConnectionChecker.Enabled := true;
+ //Check audio device != TuxDroid-TTS
+ audioDeviceCheck(GetText('Audio card trouble'));
+
//Start in foreground if requested
if startInForeground then
ShowHide1.Click;
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.mo
===================================================================
(Binary files differ)
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.po
===================================================================
---
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.po
2009-10-16 08:22:24 UTC (rev 5704)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.po
2009-10-16 08:38:37 UTC (rev 5705)
@@ -1,53 +1,60 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: TuxBox\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: nux <[email protected]>\n"
-"Language-Team: kysoh <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: BELGIUM\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-msgid "TuxDroid server initialization..."
-msgstr "TuxBox 2.0 Initialisierung..."
-
-msgid "TuxBox 2.0 is ready to use."
-msgstr "TuxBox 2.0 ist einsatzbereit."
-
-msgid "Can not stop the Tux Droid server"
-msgstr "Kann den Tux Droid Server nicht stoppen"
-
-msgid "Please, go to start menu to manually stop it."
-msgstr "Bitte Menü starten, um es manuell zu stoppen."
-
-msgid "TuxBox 2.0 is now hidden in the tray icon"
-msgstr "TuxBox 2.0 ist nun im Tray Icon verborgen"
-
-msgid "To open it again, please double-click the tray icon."
-msgstr "Um es erneut zu öffnen, Doppelklick auf das Tray Icon."
-
-msgid "Click here to make this message disappear"
-msgstr "Hier klicken, um die Nachricht auszublenden"
-
-msgid "TuxBox 2.0 Show / Hide"
-msgstr "TuxBox 2.0 Anzeigen / Verbergen"
-
-msgid "TuxBox 2.0 Warning"
-msgstr "TuxBox 2.0 Warnhinweis"
-
-msgid "Show / Hide"
-msgstr "Anzeigen / Verbergen"
-
-msgid "Mute"
-msgstr "Stumm"
-
-msgid "Help"
-msgstr "Hilfe"
-
-msgid "Quit"
-msgstr "Beenden"
-
+msgid ""
+msgstr ""
+"Project-Id-Version: TuxBox\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Rémi Jocaille <[email protected]>\n"
+"Language-Team: kysoh <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-Country: BELGIUM\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "TuxDroid server initialization..."
+msgstr "TuxBox 2.0 Initialisierung..."
+
+msgid "TuxBox 2.0 is ready to use."
+msgstr "TuxBox 2.0 ist einsatzbereit."
+
+msgid "Can not stop the Tux Droid server"
+msgstr "Kann den Tux Droid Server nicht stoppen"
+
+msgid "Please, go to start menu to manually stop it."
+msgstr "Bitte Menü starten, um es manuell zu stoppen."
+
+msgid "TuxBox 2.0 is now hidden in the tray icon"
+msgstr "TuxBox 2.0 ist nun im Tray Icon verborgen"
+
+msgid "To open it again, please double-click the tray icon."
+msgstr "Um es erneut zu öffnen, Doppelklick auf das Tray Icon."
+
+msgid "Click here to make this message disappear"
+msgstr "Hier klicken, um die Nachricht auszublenden"
+
+msgid "TuxBox 2.0 Show / Hide"
+msgstr "TuxBox 2.0 Anzeigen / Verbergen"
+
+msgid "TuxBox 2.0 Warning"
+msgstr "TuxBox 2.0 Warnhinweis"
+
+msgid "Show / Hide"
+msgstr "Anzeigen / Verbergen"
+
+msgid "Mute"
+msgstr "Stumm"
+
+msgid "Help"
+msgstr "Hilfe"
+
+msgid "Quit"
+msgstr "Beenden"
+
+msgid "Audio card trouble"
+msgstr ""
+"A problem was detected with your audio cards configuration !\n"
+"Please change your default audio card to \"TuxDroid-Audio\" instead of
\"TuxDroid-TTS\" !\n"
+"\n"
+"The \"Audio devices\" window will be opened after closing this window."
+
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/default.pot
===================================================================
---
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/default.pot
2009-10-16 08:22:24 UTC (rev 5704)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/default.pot
2009-10-16 08:38:37 UTC (rev 5705)
@@ -36,3 +36,6 @@
msgid "Quit"
msgstr ""
+
+msgid "Audio card trouble"
+msgstr ""
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/en/LC_MESSAGES/default.mo
===================================================================
(Binary files differ)
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/en/LC_MESSAGES/default.po
===================================================================
---
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/en/LC_MESSAGES/default.po
2009-10-16 08:22:24 UTC (rev 5704)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/en/LC_MESSAGES/default.po
2009-10-16 08:38:37 UTC (rev 5705)
@@ -1,53 +1,63 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: TuxBox\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: nux <[email protected]>\n"
-"Language-Team: kysoh <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: BELGIUM\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-msgid "TuxDroid server initialization..."
-msgstr "TuxBox 2.0 initialization..."
-
-msgid "TuxBox 2.0 is ready to use."
-msgstr "TuxBox 2.0 is ready to use."
-
-msgid "Can not stop the Tux Droid server"
-msgstr "Can not stop the Tux Droid server"
-
-msgid "Please, go to start menu to manually stop it."
-msgstr "Please, go to start menu to manually stop it."
-
-msgid "TuxBox 2.0 is now hidden in the tray icon"
-msgstr "TuxBox 2.0 is now hidden in the tray icon"
-
-msgid "To open it again, please double-click the tray icon."
-msgstr "To open it again, please double-click the tray icon."
-
-msgid "Click here to make this message disappear"
-msgstr "Click here to make this message disappear"
-
-msgid "TuxBox 2.0 Show / Hide"
-msgstr "TuxBox 2.0 Show / Hide"
-
-msgid "TuxBox 2.0 Warning"
-msgstr "TuxBox 2.0 Warning"
-
-msgid "Show / Hide"
-msgstr "Show / Hide"
-
-msgid "Mute"
-msgstr "Mute"
-
-msgid "Help"
-msgstr "Help"
-
-msgid "Quit"
-msgstr "Quit"
-
+msgid ""
+msgstr ""
+"Project-Id-Version: TuxBox\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Rémi Jocaille <[email protected]>\n"
+"Language-Team: kysoh <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-Country: BELGIUM\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "TuxDroid server initialization..."
+msgstr "TuxBox 2.0 initialization..."
+
+msgid "TuxBox 2.0 is ready to use."
+msgstr "TuxBox 2.0 is ready to use."
+
+msgid "Can not stop the Tux Droid server"
+msgstr "Can not stop the Tux Droid server"
+
+msgid "Please, go to start menu to manually stop it."
+msgstr "Please, go to start menu to manually stop it."
+
+msgid "TuxBox 2.0 is now hidden in the tray icon"
+msgstr "TuxBox 2.0 is now hidden in the tray icon"
+
+msgid "To open it again, please double-click the tray icon."
+msgstr "To open it again, please double-click the tray icon."
+
+msgid "Click here to make this message disappear"
+msgstr "Click here to make this message disappear"
+
+msgid "TuxBox 2.0 Show / Hide"
+msgstr "TuxBox 2.0 Show / Hide"
+
+msgid "TuxBox 2.0 Warning"
+msgstr "TuxBox 2.0 Warning"
+
+msgid "Show / Hide"
+msgstr "Show / Hide"
+
+msgid "Mute"
+msgstr "Mute"
+
+msgid "Help"
+msgstr "Help"
+
+msgid "Quit"
+msgstr "Quit"
+
+msgid "TTSLanguageName"
+msgstr "USEnglish"
+
+msgid "Audio card trouble"
+msgstr ""
+"A problem was detected with your audio cards configuration !\n"
+"Please change your default audio card to \"TuxDroid-Audio\" instead of
\"TuxDroid-TTS\" !\n"
+"\n"
+"The \"Audio devices\" window will be opened after closing this window."
+
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/fr/LC_MESSAGES/default.mo
===================================================================
(Binary files differ)
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/fr/LC_MESSAGES/default.po
===================================================================
---
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/fr/LC_MESSAGES/default.po
2009-10-16 08:22:24 UTC (rev 5704)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/fr/LC_MESSAGES/default.po
2009-10-16 08:38:37 UTC (rev 5705)
@@ -3,7 +3,7 @@
"Project-Id-Version: TuxBox\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
-"Last-Translator: nux <[email protected]>\n"
+"Last-Translator: Rémi Jocaille <[email protected]>\n"
"Language-Team: kysoh <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -51,3 +51,10 @@
msgid "Quit"
msgstr "Quitter"
+msgid "Audio card trouble"
+msgstr ""
+"Un problème a été détecté avec la configuration de votre carte son par défaut
!\n"
+"Vous devez configurer votre carte son par défaut avec \"TuxDroid-Audio\" à la
place de \"TuxDroid-TTS\" !\n"
+"\n"
+"Le panneau de configuration des cartes son va être affiché après la fermeture
de cette fenêtre."
+
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/nl/LC_MESSAGES/default.mo
===================================================================
(Binary files differ)
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/nl/LC_MESSAGES/default.po
===================================================================
---
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/nl/LC_MESSAGES/default.po
2009-10-16 08:22:24 UTC (rev 5704)
+++
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/nl/LC_MESSAGES/default.po
2009-10-16 08:38:37 UTC (rev 5705)
@@ -1,53 +1,60 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: TuxBox\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: nux <[email protected]>\n"
-"Language-Team: kysoh <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: BELGIUM\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-msgid "TuxDroid server initialization..."
-msgstr "TuxBox 2.0 aan het initializeren..."
-
-msgid "TuxBox 2.0 is ready to use."
-msgstr "TuxBox 2.0 is geladen."
-
-msgid "Can not stop the Tux Droid server"
-msgstr "Kan de Tux Droid server niet stoppen"
-
-msgid "Please, go to start menu to manually stop it."
-msgstr "Gelieve naar het startmenu te gaan om de server manueel te stoppen."
-
-msgid "TuxBox 2.0 is now hidden in the tray icon"
-msgstr "TuxBox 2.0 is nu verborgen in een tray icon."
-
-msgid "To open it again, please double-click the tray icon."
-msgstr "Dubbelklik de tray icon om het opnieuw te openen."
-
-msgid "Click here to make this message disappear"
-msgstr "Klik hier om dit bericht te verbergen."
-
-msgid "TuxBox 2.0 Show / Hide"
-msgstr "TuxBox 2.0 Tonen / Verbergen"
-
-msgid "TuxBox 2.0 Warning"
-msgstr "TuxBox 2.0 Waarschuwing"
-
-msgid "Show / Hide"
-msgstr "Tonen / Verbergen"
-
-msgid "Mute"
-msgstr "Mute"
-
-msgid "Help"
-msgstr "Help"
-
-msgid "Quit"
-msgstr "Afsluiten"
-
+msgid ""
+msgstr ""
+"Project-Id-Version: TuxBox\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Rémi Jocaille <[email protected]>\n"
+"Language-Team: kysoh <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-Country: BELGIUM\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "TuxDroid server initialization..."
+msgstr "TuxBox 2.0 aan het initializeren..."
+
+msgid "TuxBox 2.0 is ready to use."
+msgstr "TuxBox 2.0 is geladen."
+
+msgid "Can not stop the Tux Droid server"
+msgstr "Kan de Tux Droid server niet stoppen"
+
+msgid "Please, go to start menu to manually stop it."
+msgstr "Gelieve naar het startmenu te gaan om de server manueel te stoppen."
+
+msgid "TuxBox 2.0 is now hidden in the tray icon"
+msgstr "TuxBox 2.0 is nu verborgen in een tray icon."
+
+msgid "To open it again, please double-click the tray icon."
+msgstr "Dubbelklik de tray icon om het opnieuw te openen."
+
+msgid "Click here to make this message disappear"
+msgstr "Klik hier om dit bericht te verbergen."
+
+msgid "TuxBox 2.0 Show / Hide"
+msgstr "TuxBox 2.0 Tonen / Verbergen"
+
+msgid "TuxBox 2.0 Warning"
+msgstr "TuxBox 2.0 Waarschuwing"
+
+msgid "Show / Hide"
+msgstr "Tonen / Verbergen"
+
+msgid "Mute"
+msgstr "Mute"
+
+msgid "Help"
+msgstr "Help"
+
+msgid "Quit"
+msgstr "Afsluiten"
+
+msgid "Audio card trouble"
+msgstr ""
+"Er is een probleem met de configuratie van je audio apparaten !\n"
+"Selecteer \"TuxDroid-Audio\" als standaard audio apparaat in plaats van
\"TuxDroid-TTS\" !\n"
+"\n"
+"Het venster met de configuratie van je \"Audio apparaten\" wordt geopened bij
het sluiten van dit venster."
+
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) 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/devconference
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
