tux-droid-svn Mailing List for Tux Droid CE (Page 33)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jerome <c2m...@c2...> - 2009-07-29 15:55:40
|
Author: jerome
Date: 2009-07-29 17:55:19 +0200 (Wed, 29 Jul 2009)
New Revision: 5230
Modified:
software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr
Log:
* Stopping the server first before restarting TuxBox 2.0
Modified: software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr 2009-07-29 15:23:59 UTC (rev 5229)
+++ software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr 2009-07-29 15:55:19 UTC (rev 5230)
@@ -17,9 +17,8 @@
Messages;
-
-{#### Return true if TuxBox 2.0 is running ####}
-function isTuxBoxRunning() : boolean;
+{#### Return true if the targeted process is running ####}
+function isProcessRunning(process : string) : boolean;
var
ContinueLoop: BOOL;
FSnapshotHandle: THandle;
@@ -34,8 +33,8 @@
while Integer(ContinueLoop) <> 0 do
begin
if ((UpperCase(ExtractFileName(FProcessEntry32.szExeFile)) =
- UpperCase('TuxBox.exe')) or (UpperCase(FProcessEntry32.szExeFile) =
- UpperCase('TuxBox.exe'))) then
+ UpperCase(process)) or (UpperCase(FProcessEntry32.szExeFile) =
+ UpperCase(process))) then
begin
Result := True;
end;
@@ -48,6 +47,19 @@
end;
+function isSmartCoreRunning() : boolean;
+begin
+ result := isProcessRunning('pythonForTuxdroid.exe');
+end;
+
+
+{#### Return true if TuxBox 2.0 is running ####}
+function isTuxBoxRunning() : boolean;
+begin
+ result := isProcessRunning('TuxBox.exe');
+end;
+
+
{#### Set TuxBox 2.0 Foreground ####}
procedure setForeground(wParam : Integer; mess : string);
var
@@ -58,11 +70,26 @@
end;
+
{#### Start smart-core and TuxBox ####}
procedure startAll();
var
APPLICATION : string;
+ timeout : byte;
begin
+ //Stop Tuxdroid server if it is started. ( Start all function starts the server too ).
+ if isSmartCoreRunning() then
+ begin
+ timeout := 30;
+ ShellExecute(HWND(nil), 'open', 'smart_server_stop', 'show', nil, SW_HIDE);
+
+ repeat
+ sleep(1000);
+ dec(timeout, 1);
+ until ( ( not isSmartCoreRunning() ) or ( timeout = 0 ) );
+
+ end;
+
//Starting Application.
APPLICATION := '"' + GetEnvironmentVariable('PROGRAMFILES') + '\Kysoh\Tux Droid\softwares\TuxBox 2.0\TuxBox.exe"';
ShellExecute(HWND(nil), 'open', PChar(APPLICATION), 'show', nil, SW_HIDE);
|
|
From: jerome <c2m...@c2...> - 2009-07-29 15:24:18
|
Author: jerome
Date: 2009-07-29 17:23:59 +0200 (Wed, 29 Jul 2009)
New Revision: 5229
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/Unit1.dcu
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
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/gnugettext.dcu
Log:
* Finished 'start all' function.
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/Unit1.dcu
===================================================================
(Binary files differ)
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-29 15:17:02 UTC (rev 5228)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-07-29 15:23:59 UTC (rev 5229)
@@ -60,6 +60,7 @@
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-29 15:17:02 UTC (rev 5228)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-07-29 15:23:59 UTC (rev 5229)
@@ -232,6 +232,14 @@
Form1.ShowBalloonTips(gettext(SERVER_READY));
end;
+ if ParamCount() > 0 then
+ begin
+ if ParamStr(1) = 'show' then
+ begin
+ ShowHide1.Click;
+ end;
+ end;
+
end;
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/gnugettext.dcu
===================================================================
(Binary files differ)
|
|
From: jerome <c2m...@c2...> - 2009-07-29 15:17:14
|
Author: jerome
Date: 2009-07-29 17:17:02 +0200 (Wed, 29 Jul 2009)
New Revision: 5228
Modified:
software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr
Log:
* Updated the way to start 'ALL' TuxBox stuff.
Modified: software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr 2009-07-29 15:14:44 UTC (rev 5227)
+++ software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr 2009-07-29 15:17:02 UTC (rev 5228)
@@ -65,8 +65,8 @@
begin
//Starting Application.
APPLICATION := '"' + GetEnvironmentVariable('PROGRAMFILES') + '\Kysoh\Tux Droid\softwares\TuxBox 2.0\TuxBox.exe"';
- ShellExecute(HWND(nil), 'open', PChar(APPLICATION), nil, nil, SW_HIDE);
- setForeground(1, 'WindowForegroundStart');
+ ShellExecute(HWND(nil), 'open', PChar(APPLICATION), 'show', nil, SW_HIDE);
+
end;
|
|
From: remi <c2m...@c2...> - 2009-07-29 15:14:55
|
Author: remi
Date: 2009-07-29 17:14:44 +0200 (Wed, 29 Jul 2009)
New Revision: 5227
Modified:
software_suite_v3/smart-core/smart-server/trunk/installer.nsi
software_suite_v3/smart-core/smart-server/trunk/version.py
Log:
* Removed Start menu shortcuts on windows.
* Updated to 0.4.1-b10
Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-29 14:52:06 UTC (rev 5226)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-29 15:14:44 UTC (rev 5227)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.1-b9"
+!define PRODUCT_VERSION "0.4.1-b10"
; Output names
!define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"
@@ -95,19 +95,10 @@
SetOutPath "$TUXDROID_PATH\resources\images"
File tuxsys.ico
- ; Reveal shortcuts to all users
- SetShellVarContext all
- ; Write shortcut in start menu
- CreateDirectory "$SMPROGRAMS\Tux Droid\Smart-Core"
- CreateDirectory "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server"
- CreateShortCut "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server\Start.lnk" "$TUXDROID_PATH\bin\smart_server_start.exe" "" "$TUXDROID_PATH\resources\images\tuxsys.ico" 0
- CreateShortCut "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server\Stop.lnk" "$TUXDROID_PATH\bin\smart_server_stop.exe" "" "$TUXDROID_PATH\resources\images\tuxsys.ico" 0
- CreateShortCut "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server\Restart.lnk" "$TUXDROID_PATH\bin\smart_server_restart.exe" "" "$TUXDROID_PATH\resources\images\tuxsys.ico" 0
-
; Write the uninstall file
WriteUninstaller "$UNINSTALLERS_SUB_PATH\${UNINSTALLER_EXE}"
- ; Start the server is requested
+ ; Start the server if requested
Push "START" ; push the search string onto the stack
Push "false" ; push a default value onto the stack
Call GetParameterValue
@@ -150,14 +141,6 @@
RMDir /r "$TUXDROID_PATH\softwares\smart-server"
Delete "$UNINSTALLERS_SUB_PATH\${UNINSTALLER_EXE}"
- ; Reveal shortcuts to all users
- SetShellVarContext all
- ; Remove shortcuts
- Delete "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server\Stop.lnk"
- Delete "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server\Start.lnk"
- Delete "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server\Restart.lnk"
- RMDir /r "$SMPROGRAMS\Tux Droid\Smart-Core\Smart-Server"
-
; Quit the uninstaller
Quit
SectionEnd
Modified: software_suite_v3/smart-core/smart-server/trunk/version.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/version.py 2009-07-29 14:52:06 UTC (rev 5226)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py 2009-07-29 15:14:44 UTC (rev 5227)
@@ -7,7 +7,7 @@
# Distributed under the terms of the GNU General Public License
# http://www.gnu.org/copyleft/gpl.html
-version = '0.4.1-b9'
+version = '0.4.1-b10'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
|
From: jerome <c2m...@c2...> - 2009-07-29 14:52:20
|
Author: jerome
Date: 2009-07-29 16:52:06 +0200 (Wed, 29 Jul 2009)
New Revision: 5226
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.dfm
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/gnugettext.dcu
Log:
* Added windows message handler ( launcher ) capability.
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-29 14:50:21 UTC (rev 5225)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas 2009-07-29 14:52:06 UTC (rev 5226)
@@ -294,8 +294,6 @@
{#### This function stops the tux droid server. ####}
function stopServer() : boolean;
-var
- request_result : string;
begin
ShellExecute(HWND(nil), 'open', PChar('smart_server_stop'), nil, nil, SW_HIDE);
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.dfm
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-07-29 14:50:21 UTC (rev 5225)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-07-29 14:52:06 UTC (rev 5226)
@@ -60,7 +60,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-29 14:50:21 UTC (rev 5225)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-07-29 14:52:06 UTC (rev 5226)
@@ -141,13 +141,12 @@
function GetAllUsersDir() : string;
function GetTuxDroidDataBaseDirectory() : string;
procedure saveProperties();
+ procedure DefaultHandler(var Msg); override;
-
private
{ Darations priv }
IconData: TNewNotifyIconData;
procedure WMAppelMessage(var msg : TMessage); message wm_AppelMessage;
-
procedure OpenUrl(const url : String);
public
@@ -166,6 +165,7 @@
balloonShowed : boolean;
properties : TStringList;
reduce_balloon : boolean;
+ MessageSys : UInt;
implementation
@@ -179,8 +179,11 @@
//Form initialization.
procedure TForm1.FormCreate(Sender: TObject);
begin
+ MessageSys := RegisterWindowMessage('WindowForegroundRequest');
reduce_balloon := false;
+
url := 'http://127.0.0.1:270/user/';
+
TUXBOX_CONF_FILE := Form1.GetTuxDroidDataBaseDirectory
+ '\configurations\TuxBox2.0.conf';
@@ -348,21 +351,25 @@
//Tray menu 'quit' click.
procedure TForm1.Quit1Click(Sender: TObject);
begin
- if TuxUtils.stopServer() then
- begin
- Form1.saveProperties;
- properties.Free;
- ConnectionChecker.Enabled := false;
- ConnectionChecker.Free;
- AppIcon.Free;
- Form1.DeleteSysTrayIcon;
- EmbeddedWB1.Free;
- Application.Terminate;
- end
- else if TuxUtils.isTuxDroidServerStarted() then
- begin
- Form1.ShowBalloonTips(gettext(SERVER_STOP_ERROR_0) + slinebreak +
- gettext(SERVER_STOP_ERROR_1));
+ try
+ if TuxUtils.stopServer() then
+ begin
+ Form1.saveProperties;
+ properties.Free;
+ ConnectionChecker.Enabled := false;
+ ConnectionChecker.Free;
+ AppIcon.Free;
+ Form1.DeleteSysTrayIcon;
+ Application.Terminate;
+ end
+ else if TuxUtils.isTuxDroidServerStarted() then
+ begin
+ Form1.ShowBalloonTips(gettext(SERVER_STOP_ERROR_0) + slinebreak +
+ gettext(SERVER_STOP_ERROR_1));
+ end;
+ except
+ on e : Exception do
+ Application.Terminate;
end;
end;
@@ -479,6 +486,7 @@
temp : TStringList;
begin
+
server := TuxUtils.isTuxDroidServerStarted();
//Trying to get states only if server is started.
@@ -687,5 +695,22 @@
end;
+{#### Default messages handler ####}
+procedure TForm1.DefaultHandler(var msg);
+begin
+ inherited DefaultHandler(Msg);
+ if (TMessage(Msg).Msg = MessageSys) then
+ begin
+ EmbeddedWB1.Go(url);
+ Form1.Visible := true;
+
+ if (TMessage(Msg).WParam) = 0 then
+ begin
+ SetForegroundWindow(Application.Handle);
+ end
+ end;
+end;
+
+
end.
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/gnugettext.dcu
===================================================================
(Binary files differ)
|
|
From: jerome <c2m...@c2...> - 2009-07-29 14:50:40
|
Author: jerome
Date: 2009-07-29 16:50:21 +0200 (Wed, 29 Jul 2009)
New Revision: 5225
Added:
software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/
software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.cfg
software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dof
software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr
Log:
* Added launcher for TuxBox 2.0 ( I still have some troubles with 'start all' functionality.
Added: software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.cfg
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.cfg (rev 0)
+++ software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.cfg 2009-07-29 14:50:21 UTC (rev 5225)
@@ -0,0 +1,35 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"c:\program files\borland\delphi6\Projects\Bpl"
+-LN"c:\program files\borland\delphi6\Projects\Bpl"
Added: software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dof
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dof (rev 0)
+++ software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dof 2009-07-29 14:50:21 UTC (rev 5225)
@@ -0,0 +1,83 @@
+[FileVersion]
+Version=6.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=0
+R=0
+S=0
+T=0
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=
+Packages=
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
Added: software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr (rev 0)
+++ software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/launcher.dpr 2009-07-29 14:50:21 UTC (rev 5225)
@@ -0,0 +1,87 @@
+program launcher;
+
+{$APPTYPE CONSOLE}
+
+uses
+ SysUtils,
+ Registry,
+ Variants,
+ TlHelp32,
+ ShellAPI,
+ Classes,
+ StdCtrls,
+ OleCtrls,
+ Controls,
+ Windows,
+ dialogs,
+ Messages;
+
+
+
+{#### Return true if TuxBox 2.0 is running ####}
+function isTuxBoxRunning() : boolean;
+var
+ ContinueLoop: BOOL;
+ FSnapshotHandle: THandle;
+ FProcessEntry32: TProcessEntry32;
+begin
+ FSnapshotHandle := CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+ FProcessEntry32.dwSize := SizeOf(FProcessEntry32);
+ ContinueLoop := Process32First(FSnapshotHandle, FProcessEntry32);
+
+ Result := False;
+
+ while Integer(ContinueLoop) <> 0 do
+ begin
+ if ((UpperCase(ExtractFileName(FProcessEntry32.szExeFile)) =
+ UpperCase('TuxBox.exe')) or (UpperCase(FProcessEntry32.szExeFile) =
+ UpperCase('TuxBox.exe'))) then
+ begin
+ Result := True;
+ end;
+
+ ContinueLoop := Process32Next(FSnapshotHandle, FProcessEntry32);
+
+ end;
+
+ CloseHandle(FSnapshotHandle);
+end;
+
+
+{#### Set TuxBox 2.0 Foreground ####}
+procedure setForeground(wParam : Integer; mess : string);
+var
+ MessageSys : UInt;
+begin
+ MessageSys := RegisterWindowMessage(PChar(mess));
+ SendMessage(HWND_BROADCAST, MessageSys, wParam, 0);
+end;
+
+
+{#### Start smart-core and TuxBox ####}
+procedure startAll();
+var
+ APPLICATION : string;
+begin
+ //Starting Application.
+ APPLICATION := '"' + GetEnvironmentVariable('PROGRAMFILES') + '\Kysoh\Tux Droid\softwares\TuxBox 2.0\TuxBox.exe"';
+ ShellExecute(HWND(nil), 'open', PChar(APPLICATION), nil, nil, SW_HIDE);
+ setForeground(1, 'WindowForegroundStart');
+end;
+
+
+{#### Main entry point ####}
+begin
+ if isTuxBoxRunning() then
+ begin
+ try
+ setForeground(0, 'WindowForegroundRequest');
+ except
+ end;
+ end
+ else
+ begin
+ startAll();
+ end;
+end.
+
|
|
From: remi <c2m...@c2...> - 2009-07-29 14:42:24
|
Author: remi
Date: 2009-07-29 16:42:10 +0200 (Wed, 29 Jul 2009)
New Revision: 5224
Modified:
software_suite_v3/smart-core/smart-api/python/trunk/installer.nsi
Log:
* Fixed shortcut location in the start menu (-> TuxBox 2.0\Tuxware\Tux Droid Shell.lnk)
Modified: software_suite_v3/smart-core/smart-api/python/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-api/python/trunk/installer.nsi 2009-07-29 13:43:47 UTC (rev 5223)
+++ software_suite_v3/smart-core/smart-api/python/trunk/installer.nsi 2009-07-29 14:42:10 UTC (rev 5224)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart API for python"
-!define PRODUCT_VERSION "0.4.0"
+!define PRODUCT_VERSION "0.4.0-b1"
; Output names
!define FINAL_INSTALLER_EXE "pySmartAPIInstaller_${PRODUCT_VERSION}.exe"
@@ -71,7 +71,7 @@
; Reveal shortcuts to all users
SetShellVarContext all
; Write shortcut in start menu
- CreateShortCut "$SMPROGRAMS\Tux Droid\Tux Droid Shell.lnk" "$TUXDROID_PATH\bin\tuxsh.bat" "" "$TUXDROID_PATH\resources\images\tuxsh.ico" 0
+ CreateShortCut "$SMPROGRAMS\TuxBox 2.0\Tuxware\Tux Droid Shell.lnk" "$TUXDROID_PATH\bin\tuxsh.bat" "" "$TUXDROID_PATH\resources\images\tuxsh.ico" 0
; Write the uninstall file
WriteUninstaller "$UNINSTALLERS_SUB_PATH\${UNINSTALLER_EXE}"
@@ -98,7 +98,7 @@
; Reveal shortcuts to all users
SetShellVarContext all
; Remove shortcuts
- Delete "$SMPROGRAMS\Tux Droid\Tux Shell.lnk"
+ Delete "$SMPROGRAMS\TuxBox 2.0\Tuxware\Tux Droid Shell.lnk"
; Quit the uninstaller
Quit
|
|
From: jerome <c2m...@c2...> - 2009-07-29 13:44:04
|
Author: jerome Date: 2009-07-29 15:43:47 +0200 (Wed, 29 Jul 2009) New Revision: 5223 Added: software_suite_v3/software/tool/tux_droid_browser_launcher/ software_suite_v3/software/tool/tux_droid_browser_launcher/branches/ software_suite_v3/software/tool/tux_droid_browser_launcher/tags/ software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/ Log: * Added TuxBox 2.0 launcher project directories. |
|
From: remi <c2m...@c2...> - 2009-07-29 11:49:50
|
Author: remi
Date: 2009-07-29 13:49:39 +0200 (Wed, 29 Jul 2009)
New Revision: 5222
Added:
software_suite_v3/smart-core/smart-server/trunk/util/smartcore/SmartServerCommander.py
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
Log:
* Added functionalities to launch Attitunes studio and Tux Droid Controller by http requests
* Added a python script to send commands to smart-server.
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-07-29 09:55:03 UTC (rev 5221)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-07-29 11:49:39 UTC (rev 5222)
@@ -559,6 +559,8 @@
contentStruct = self.getDefaultContentStruct()
contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
language = parameters['language']
+ if language.lower() == "null":
+ language = resourceUsers.getCurrentFirstLanguage()
outputPath = os.path.join(resourceUsers.getCurrentUserBasePath(),
"attitunes")
t = threading.Thread(target = resourcePluginsServer.startPlugin,
@@ -622,6 +624,40 @@
resourceWIUser01.addService(TDSServiceWIUser01EditAttitune)
# ------------------------------------------------------------------------------
+# Declaration of the service "start_tux_controller".
+# ------------------------------------------------------------------------------
+class TDSServiceWIUser01StartTuxController(TDSService):
+
+ def configure(self):
+ self.parametersDict = {
+ 'language' : 'string',
+ }
+ self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
+ self.exclusiveExecution = False
+ self.name = "start_tux_controller"
+ self.comment = "Start Tux Controller tool."
+
+ def execute(self, id, parameters):
+ headersStruct = self.getDefaultHeadersStruct()
+ contentStruct = self.getDefaultContentStruct()
+ contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
+ language = parameters['language']
+ if language.lower() == "null":
+ language = resourceUsers.getCurrentFirstLanguage()
+ t = threading.Thread(target = resourcePluginsServer.startPlugin,
+ args = (
+ "548f7a77-567d-773e-a0ef-321fe63a1c88",
+ "run",
+ {
+ 'language' : language,
+ }))
+ t.start()
+ return headersStruct, contentStruct
+
+# Register the service into the resource
+resourceWIUser01.addService(TDSServiceWIUser01StartTuxController)
+
+# ------------------------------------------------------------------------------
# Declaration of the service "global_configuration".
# ------------------------------------------------------------------------------
class TDSServiceWIUser01GlobalConfiguration(TDSService):
Added: software_suite_v3/smart-core/smart-server/trunk/util/smartcore/SmartServerCommander.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/smartcore/SmartServerCommander.py (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/util/smartcore/SmartServerCommander.py 2009-07-29 11:49:39 UTC (rev 5222)
@@ -0,0 +1,40 @@
+# Copyright (C) 2009 C2ME Sa
+# Remi Jocaille <rem...@c2...>
+# Distributed under the terms of the GNU General Public License
+# http://www.gnu.org/copyleft/gpl.html
+
+import socket
+import httplib
+import sys
+
+def sendRequest(host, port, request):
+ old_timeout = socket.getdefaulttimeout()
+ socket.setdefaulttimeout(2.)
+ hp = "%s:%d" % (host, port)
+ h = httplib.HTTP(hp)
+ try:
+ h.connect()
+ except:
+ socket.setdefaulttimeout(old_timeout)
+ return 1
+ h.putrequest("GET", request)
+ h.endheaders()
+ errcode, errmsg, headers = h.getreply()
+ if errcode != 200:
+ socket.setdefaulttimeout(old_timeout)
+ return 1
+ else:
+ socket.setdefaulttimeout(old_timeout)
+ return 0
+
+if __name__ == "__main__":
+ if len(sys.argv) != 4:
+ sys.exit(1)
+ host = sys.argv[1]
+ try:
+ port = eval(sys.argv[2])
+ except:
+ sys.exit(1)
+ request = sys.argv[3]
+ ret = sendRequest(host, port, request)
+ sys.exit(ret)
|
|
From: remi <c2m...@c2...> - 2009-07-29 09:55:19
|
Author: remi
Date: 2009-07-29 11:55:03 +0200 (Wed, 29 Jul 2009)
New Revision: 5221
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/01_resourceTuxOSL.py
Log:
* Fixed the bug of "leds off" after the "TuxBox Ready" attitune play
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/01_resourceTuxOSL.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/01_resourceTuxOSL.py 2009-07-29 08:49:22 UTC (rev 5220)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/01_resourceTuxOSL.py 2009-07-29 09:55:03 UTC (rev 5221)
@@ -110,7 +110,7 @@
# Reference locutors list
resourcePluginsServer.getPluginsContainer().setLocutorsList(self.ttsVoicesList())
# Play the opening attitune.
- resourceTuxDriver.ledsOff("LED_BOTH")
+ resourceTuxDriver.ledsOn("LED_BOTH", 1.0)
resourceAttituneManager.playAttitune("TuxBox Ready", 0.0)
# Start the robot/content interactions
resourceRobotContentInteractions.startMe()
|
|
From: jerome <c2m...@c2...> - 2009-07-29 08:49:34
|
Author: jerome
Date: 2009-07-29 10:49:22 +0200 (Wed, 29 Jul 2009)
New Revision: 5220
Modified:
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:
* Fixed : ticket 161 ( polishing ) : Remove D&D function from browser.
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-29 08:48:41 UTC (rev 5219)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-07-29 08:49:22 UTC (rev 5220)
@@ -212,6 +212,7 @@
//states initialization
TuxUtils.initKnowedVars();
//Starting status pooling.
+ EmbeddedWB1.RegisterAsDropTarget := false;
EmbeddedWB1.Go('about:blank');
//Initialization of GnuGetText object and updating language.
@@ -618,9 +619,10 @@
strPLCopy(IconData.szInfo, TipInfo, SizeOf(IconData.szInfo) - 1);
TipTitle := gettext(TUX_BOX_WARNING_MSG);
strPLCopy(IconData.szInfoTitle, TipTitle, SizeOf(IconData.szInfoTitle) - 1);
- IconData.dwInfoFlags := NIIF_INFO; //NIIF_ERROR; //NIIF_WARNING;
+ IconData.dwInfoFlags := NIIF_INFO;
+ //NIIF_ERROR;
+ //NIIF_WARNING;
Shell_NotifyIcon(NIM_MODIFY, @IconData);
- {in my testing, the following code has no use}
IconData.DUMMYUNIONNAME.uVersion := NOTIFYICON_VERSION;
Shell_NotifyIcon(NIM_SETVERSION, @IconData);
end;
|
|
From: remi <c2m...@c2...> - 2009-07-29 08:48:55
|
Author: remi Date: 2009-07-29 10:48:41 +0200 (Wed, 29 Jul 2009) New Revision: 5219 Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/en.po software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/fr.po software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/nl.po software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.pot Log: * Translations of the enum parameter "Morning, Afternoon, Evening" was missing. Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/en.po 2009-07-29 08:41:11 UTC (rev 5218) +++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/en.po 2009-07-29 08:48:41 UTC (rev 5219) @@ -31,6 +31,9 @@ msgid "Select time frame" msgstr "Select time frame" +msgid "Morning, Afternoon, Evening" +msgstr "Morning, Afternoon, Evening" + msgid "Give program description" msgstr "Give program description" Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/fr.po 2009-07-29 08:41:11 UTC (rev 5218) +++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/fr.po 2009-07-29 08:48:41 UTC (rev 5219) @@ -31,8 +31,11 @@ msgid "Select time frame" msgstr "Sélectionnez une tranche horaire" +msgid "Morning, Afternoon, Evening" +msgstr "Matin, Midi, Soir" + msgid "Give program description" -msgstr "Donnee la description du programme" +msgstr "Donner la description du programme" msgid "Give currently playing program" msgstr "Donner le programme actuel" Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/nl.po 2009-07-29 08:41:11 UTC (rev 5218) +++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/nl.po 2009-07-29 08:48:41 UTC (rev 5219) @@ -31,6 +31,9 @@ msgid "Select time frame" msgstr "Selecteer periode van de dag" +msgid "Morning, Afternoon, Evening" +msgstr "Ochtend, Middag, Avond" + msgid "Give program description" msgstr "Geef programma omscrijving" Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.pot 2009-07-29 08:41:11 UTC (rev 5218) +++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.pot 2009-07-29 08:48:41 UTC (rev 5219) @@ -31,6 +31,9 @@ msgid "Select time frame" msgstr "" +msgid "Morning, Afternoon, Evening" +msgstr "" + msgid "Give program description" msgstr "" |
|
From: remi <c2m...@c2...> - 2009-07-29 08:41:27
|
Author: remi Date: 2009-07-29 10:41:11 +0200 (Wed, 29 Jul 2009) New Revision: 5218 Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot Log: * Translation of the default value of the parameter "Username" was missing. Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po 2009-07-29 08:35:43 UTC (rev 5217) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po 2009-07-29 08:41:11 UTC (rev 5218) @@ -7,6 +7,9 @@ msgid "Username" msgstr "Username" +msgid "your_user_name" +msgstr "your user name" + msgid "Password" msgstr "Password" Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po 2009-07-29 08:35:43 UTC (rev 5217) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po 2009-07-29 08:41:11 UTC (rev 5218) @@ -7,6 +7,9 @@ msgid "Username" msgstr "Utilisateur" +msgid "your_user_name" +msgstr "Votre nom d'utilisateur" + msgid "Password" msgstr "Mot de passe" Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po 2009-07-29 08:35:43 UTC (rev 5217) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po 2009-07-29 08:41:11 UTC (rev 5218) @@ -7,6 +7,9 @@ msgid "Username" msgstr "Gebruikersnaam" +msgid "your_user_name" +msgstr "uw gebruikersnaam" + msgid "Password" msgstr "Wachtwoord" Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot 2009-07-29 08:35:43 UTC (rev 5217) +++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot 2009-07-29 08:41:11 UTC (rev 5218) @@ -7,6 +7,9 @@ msgid "Username" msgstr "" +msgid "your_user_name" +msgstr "" + msgid "Password" msgstr "" |
|
From: remi <c2m...@c2...> - 2009-07-29 08:36:02
|
Author: remi Date: 2009-07-29 10:35:43 +0200 (Wed, 29 Jul 2009) New Revision: 5217 Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/en.po software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/fr.po software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/nl.po software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.pot Log: * Translation of the default value of "Login" was missing. Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/en.po 2009-07-28 16:11:20 UTC (rev 5216) +++ software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/en.po 2009-07-29 08:35:43 UTC (rev 5217) @@ -7,6 +7,9 @@ msgid "Login" msgstr "Login" +msgid "your login" +msgstr "your login" + msgid "Password" msgstr "Password" Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/fr.po 2009-07-28 16:11:20 UTC (rev 5216) +++ software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/fr.po 2009-07-29 08:35:43 UTC (rev 5217) @@ -8,6 +8,9 @@ msgid "Login" msgstr "Login" +msgid "your login" +msgstr "votre login" + msgid "Password" msgstr "Mot de passe" Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/nl.po 2009-07-28 16:11:20 UTC (rev 5216) +++ software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/nl.po 2009-07-29 08:35:43 UTC (rev 5217) @@ -7,6 +7,9 @@ msgid "Login" msgstr "Login" +msgid "your login" +msgstr "uw login" + msgid "Password" msgstr "Wachtwoord" Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.pot 2009-07-28 16:11:20 UTC (rev 5216) +++ software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.pot 2009-07-29 08:35:43 UTC (rev 5217) @@ -7,6 +7,9 @@ msgid "Login" msgstr "" +msgid "your login" +msgstr "" + msgid "Password" msgstr "" |
|
From: remi <c2m...@c2...> - 2009-07-28 16:11:36
|
Author: remi
Date: 2009-07-28 18:11:20 +0200 (Tue, 28 Jul 2009)
New Revision: 5216
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/02_resourceGagdetsServer.py
Log:
* Select the current user language to show the online gadgets data
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/02_resourceGagdetsServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/02_resourceGagdetsServer.py 2009-07-28 16:00:44 UTC (rev 5215)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/02_resourceGagdetsServer.py 2009-07-28 16:11:20 UTC (rev 5216)
@@ -324,7 +324,7 @@
language = parameters['language']
gadgetsOnlineContainer = resourceGadgetsServer.getGadgetsContainer().getGadgetsOnlineContainer()
gadgetsOnlineContainer.update()
- data = gadgetsOnlineContainer.getData("fr", filter)
+ data = gadgetsOnlineContainer.getData(language, filter)
if data == None:
contentStruct['root']['result'] = getStrError(E_TDREST_FAILED)
else:
|
|
From: remi <c2m...@c2...> - 2009-07-28 16:01:05
|
Author: remi
Date: 2009-07-28 18:00:44 +0200 (Tue, 28 Jul 2009)
New Revision: 5215
Modified:
software_suite_v3/smart-core/smart-server/trunk/installer.nsi
software_suite_v3/smart-core/smart-server/trunk/version.py
Log:
* Updated version to 0.4.1-b9
Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-28 16:00:20 UTC (rev 5214)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-28 16:00:44 UTC (rev 5215)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.1-b8"
+!define PRODUCT_VERSION "0.4.1-b9"
; Output names
!define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"
Modified: software_suite_v3/smart-core/smart-server/trunk/version.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/version.py 2009-07-28 16:00:20 UTC (rev 5214)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py 2009-07-28 16:00:44 UTC (rev 5215)
@@ -7,7 +7,7 @@
# Distributed under the terms of the GNU General Public License
# http://www.gnu.org/copyleft/gpl.html
-version = '0.4.1-b8'
+version = '0.4.1-b9'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
|
From: remi <c2m...@c2...> - 2009-07-28 16:00:34
|
Author: remi Date: 2009-07-28 18:00:20 +0200 (Tue, 28 Jul 2009) New Revision: 5214 Added: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/nl.po Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po Log: * Added nl translations of the user interface * Updated the en translations Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-28 14:40:12 UTC (rev 5213) +++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-28 16:00:20 UTC (rev 5214) @@ -11,7 +11,7 @@ msgstr "Tools" msgid "online" -msgstr "Online" +msgstr "Online Shop" msgid "status" msgstr "Status" @@ -32,7 +32,7 @@ msgstr "All" msgid "on_demand" -msgstr "My favorites" +msgstr "My Favorites" msgid "alerts" msgstr "Alerts" @@ -104,7 +104,7 @@ msgstr "My week" msgid "all_days" -msgstr "All days" +msgstr "Every day" msgid "working_days" msgstr "Working days" Added: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/nl.po =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/nl.po (rev 0) +++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/nl.po 2009-07-28 16:00:20 UTC (rev 5214) @@ -0,0 +1,191 @@ +msgid "live_with_tux" +msgstr "Leef met Tux" + +msgid "gadgets" +msgstr "Gadgets" + +msgid "attitunes" +msgstr "Attitunes" + +msgid "tools" +msgstr "Extra" + +msgid "online" +msgstr "Online Shop" + +msgid "status" +msgstr "Status" + +msgid "sound_on" +msgstr "Klank aan" + +msgid "sound_off" +msgstr "Klank uit" + +msgid "start" +msgstr "Start" + +msgid "stop" +msgstr "Stop" + +msgid "all" +msgstr "Alles" + +msgid "on_demand" +msgstr "Favorieten" + +msgid "alerts" +msgstr "Alarmen" + +msgid "delete" +msgstr "Wissen" + +msgid "popup_not_yet_implemented" +msgstr "Deze functie is nog niet geïmplementeerd." + +msgid "popup_confirm_delete_gadget" +msgstr "Wil je deze gadget wissen ?" + +msgid "popup_confirm_download_gadget" +msgstr "Wil je deze gadget downloaden ?" + +msgid "popup_confirm_update_gadget" +msgstr "Wil je deze gadget updaten ?" + +msgid "popup_gadget_has_been_updated" +msgstr "De gadget is geupdate." + +msgid "popup_confirm_delete_attitune" +msgstr "Wil je deze attitune verwijderen ?" + +msgid "yes" +msgstr "Ja" + +msgid "no" +msgstr "Nee" + +msgid "close" +msgstr "Sluiten" + +msgid "apply" +msgstr "Opslaan" + +msgid "cancel" +msgstr "Annuleren" + +msgid "gadget_settings" +msgstr "Gadget configuratie" + +msgid "gadget_name" +msgstr "Gadget naam" + +msgid "my_use_of_the_gadget" +msgstr "Mijn gebruik van de gadget" + +msgid "on_demand_config_section" +msgstr "Favorieten" + +msgid "on_demand_description" +msgstr "Plaats deze gadget in mijn Favorieten" + +msgid "date" +msgstr "Datum" + +msgid "starting_at" +msgstr "Starting om" + +msgid "stopping_at" +msgstr "Stoppen om" + +msgid "delay" +msgstr "Frequentie" + +msgid "my_week" +msgstr "Mijn week" + +msgid "all_days" +msgstr "Elke dag" + +msgid "working_days" +msgstr "Werkdagen" + +msgid "weekend" +msgstr "Weekend" + +msgid "monday" +msgstr "Maandag" + +msgid "tuesday" +msgstr "Dinsdag" + +msgid "wednesday" +msgstr "Woensdag" + +msgid "thursday" +msgstr "Donderdag" + +msgid "friday" +msgstr "Vrijdag" + +msgid "saturday" +msgstr "Zaterdag" + +msgid "sunday" +msgstr "Zondag" + +msgid "quart_hours" +msgstr "Kwartier" + +msgid "half_hours" +msgstr "Half uur" + +msgid "full_hours" +msgstr "Uur" + +msgid "crazy" +msgstr "Overdreven" + +msgid "often" +msgstr "Vaak" + +msgid "normal" +msgstr "Normaal" + +msgid "rarely" +msgstr "Zelden" + +msgid "show" +msgstr "Tonen" + +msgid "online_documentation" +msgstr "Online documentatie" + +msgid "documentation_url" +msgstr "http://www.kysoh.com/documentation-3?set_language=nl" + +msgid "global_settings" +msgstr "Algemene configuratie" + +msgid "introduction_alerts" +msgstr "Introductie alarmen" + +msgid "voice_settings" +msgstr "Stem configuratie" + +msgid "voice_param_title" +msgstr "Stem" + +msgid "pitch_param_title" +msgstr "Toonhoogte" + +msgid "test" +msgstr "Test" + +msgid "pitch_tux_voice" +msgstr "Tux stem" + +msgid "pitch_normal" +msgstr "Normaal" + +msgid "pitch_low" +msgstr "Laag" |
|
From: jerome <c2m...@c2...> - 2009-07-28 14:40:25
|
Author: jerome
Date: 2009-07-28 16:40:12 +0200 (Tue, 28 Jul 2009)
New Revision: 5213
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Removed two debug messages.
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 14:38:12 UTC (rev 5212)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-07-28 14:40:12 UTC (rev 5213)
@@ -246,10 +246,6 @@
begin
if sender.ClassName = 'TForm1' then
begin
- if isBalloonCanShow() = 'true' then
- showmessage('true')
- else
- showmessage('false');
if Form1.isBalloonCanShow() = 'true' then
begin
|
|
From: jerome <c2m...@c2...> - 2009-07-28 14:38:23
|
Author: jerome
Date: 2009-07-28 16:38:12 +0200 (Tue, 28 Jul 2009)
New Revision: 5212
Modified:
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.dfm
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Updated the way to store / read TuxBox properties.
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.dfm
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-07-28 14:37:42 UTC (rev 5211)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-07-28 14:38:12 UTC (rev 5212)
@@ -60,6 +60,7 @@
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-28 14:37:42 UTC (rev 5211)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-07-28 14:38:12 UTC (rev 5212)
@@ -134,12 +134,13 @@
procedure ShowBalloonTips(mess : string);
procedure DeleteSysTrayIcon();
procedure HideBalloonTips();
- procedure setBalloonCanShow(showable : boolean);
+ procedure setBalloonCanShow(showable : string);
procedure updateCaptions();
- function isBalloonCanShow() : boolean;
+ function isBalloonCanShow() : string;
function GetAllUsersDir() : string;
function GetTuxDroidDataBaseDirectory() : string;
+ procedure saveProperties();
private
@@ -163,6 +164,8 @@
AppIcon : TIcon;
started : boolean;
balloonShowed : boolean;
+ properties : TStringList;
+ reduce_balloon : boolean;
implementation
@@ -176,10 +179,24 @@
//Form initialization.
procedure TForm1.FormCreate(Sender: TObject);
begin
-
+ reduce_balloon := false;
url := 'http://127.0.0.1:270/user/';
TUXBOX_CONF_FILE := Form1.GetTuxDroidDataBaseDirectory
+ '\configurations\TuxBox2.0.conf';
+
+ properties := TStringList.Create;
+
+ if FileExists(TUXBOX_CONF_FILE) then
+ begin
+ properties.LoadFromFile(TUXBOX_CONF_FILE);
+ end
+ else
+ begin
+ properties.CommaText := 'show_balloon=true, language=en';
+ end;
+
+ language := properties.Values['language'];
+
started := false;
//Setting app icon.
@@ -198,7 +215,7 @@
EmbeddedWB1.Go('about:blank');
//Initialization of GnuGetText object and updating language.
- gnugettext.UseLanguage('en');
+ gnugettext.UseLanguage(language);
TP_GlobalIgnoreClassProperty(TEmbeddedWB, 'StatusText');
TP_Ignore(self, '.StatusText');
TranslateComponent(self);
@@ -229,8 +246,14 @@
begin
if sender.ClassName = 'TForm1' then
begin
- if Form1.isBalloonCanShow() then
+ if isBalloonCanShow() = 'true' then
+ showmessage('true')
+ else
+ showmessage('false');
+
+ if Form1.isBalloonCanShow() = 'true' then
begin
+ reduce_balloon := true;
Form1.ShowBalloonTips(gettext(TUX_BOX_HIDDEN_0) + slinebreak +
gettext(TUX_BOX_HIDDEN_1) + slinebreak +
gettext(TUX_BOX_HIDDEN_2));
@@ -247,6 +270,8 @@
procedure TForm1.WMQueryEndSession(var Message: TWMQueryEndSession);
begin
inherited;
+ Form1.saveProperties;
+ properties.Free;
ConnectionChecker.Enabled := false;
TuxUtils.stopServer();
Shell_NotifyIcon(Nim_DELETE, @IconData);
@@ -328,6 +353,8 @@
begin
if TuxUtils.stopServer() then
begin
+ Form1.saveProperties;
+ properties.Free;
ConnectionChecker.Enabled := false;
ConnectionChecker.Free;
AppIcon.Free;
@@ -407,9 +434,10 @@
PostMessage(Handle, WM_NULL, 0, 0);
end
- else if msg.LParam = NIN_BALLOONUSERCLICK then
+ else if (msg.LParam = NIN_BALLOONUSERCLICK) and (reduce_balloon) then
begin
- setBalloonCanShow(false);
+ setBalloonCanShow('false');
+ reduce_balloon := false;
end
end;
@@ -641,60 +669,23 @@
{ Return true if the balloon can be showed. }
-function TForm1.isBalloonCanShow() : boolean;
-var
- res : string;
- F : TextFile;
- beginPos : Integer;
+function TForm1.isBalloonCanShow() : string;
begin
- if not FileExists(TUXBOX_CONF_FILE) then
- begin
- //Creating state file.
- Form1.setBalloonCanShow(true);
- result := true;
- end
- else
- begin
- try
- AssignFile(F, TUXBOX_CONF_FILE);
- reset(F);
- readLn(F, res);
- closeFile(F);
- beginPos := Pos('show_balloon=', res) + Length('show_balloon=');
- if(beginPos <> 0) then
- begin
- try
- result := strtobool(Copy(res, beginPos, SizeOf(res) - 1))
- except
- on e : Exception do
- result := true;
- end;
- end
- else
- result := true;
-
- except
- result := true;
- end;
- end;
+ result := properties.Values['show_balloon'];
end;
{ Set the balloon visible or not }
-procedure TForm1.setBalloonCanShow(showable : boolean);
-var
- F : TextFile;
+procedure TForm1.setBalloonCanShow(showable : string);
begin
- {$i+}
- try
- AssignFile(F, TUXBOX_CONF_FILE);
- rewrite(F);
- writeLn(F, 'show_balloon=' + booltostr(showable));
- closeFile(F);
- except
+ properties.Values['show_balloon'] := showable;
+end;
- end;
- {$i-}
+
+{#### Saving properties to the conf file ####}
+procedure TForm1.saveProperties();
+begin
+ properties.SaveToFile(TUXBOX_CONF_FILE);
end;
|
|
From: jerome <c2m...@c2...> - 2009-07-28 14:37:54
|
Author: jerome Date: 2009-07-28 16:37:42 +0200 (Tue, 28 Jul 2009) New Revision: 5211 Modified: 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 Log: * Updated mo and po files ( serveur TuxDroid ==> serveur Tux Droid ). 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-07-28 14:23:05 UTC (rev 5210) +++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/fr/LC_MESSAGES/default.po 2009-07-28 14:37:42 UTC (rev 5211) @@ -1,53 +1,53 @@ -msgid "" -msgstr "" -"Project-Id-Version: TuxBox\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: nux <jer...@ky...>\n" -"Language-Team: kysoh <jer...@ky...>\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 "Initialisation du serveur TuxDroid." - -msgid "TuxBox 2.0 is ready to use." -msgstr "TuxBox 2.0 est prêt." - -msgid "Can not stop the Tux Droid server" -msgstr "Impossible de stopper le serveur Tux Droid." - -msgid "Please, go to start menu to manually stop it." -msgstr "S'il vous plaît, rendez vous dans le menu démarrer pour le stopper manuellement" - -msgid "TuxBox 2.0 is now hidden in the tray icon" -msgstr "TuxBox 2.0 est maintenant masqué dans la barre système." - -msgid "To open it again, please double-click the tray icon." -msgstr "Pour l'ouvrir à nouveau, double cliquez sur l'icone." - -msgid "Click here to make this message disappear" -msgstr "Cliquez ici pour ne plus voir ce message." - -msgid "TuxBox 2.0 Show / Hide" -msgstr "Voir / Masquer TuxBox 2.0" - -msgid "TuxBox 2.0 Warning" -msgstr "TuxBox 2.0 Notification" - -msgid "Show / Hide" -msgstr "Voir / Masquer" - -msgid "Mute" -msgstr "Couper le son" - -msgid "Help" -msgstr "Aide" - -msgid "Quit" -msgstr "Quitter" - +msgid "" +msgstr "" +"Project-Id-Version: TuxBox\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: nux <jer...@ky...>\n" +"Language-Team: kysoh <jer...@ky...>\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 "Initialisation du serveur Tux Droid." + +msgid "TuxBox 2.0 is ready to use." +msgstr "TuxBox 2.0 est prêt." + +msgid "Can not stop the Tux Droid server" +msgstr "Impossible de stopper le serveur Tux Droid." + +msgid "Please, go to start menu to manually stop it." +msgstr "S'il vous plaît, rendez vous dans le menu démarrer pour le stopper manuellement" + +msgid "TuxBox 2.0 is now hidden in the tray icon" +msgstr "TuxBox 2.0 est maintenant masqué dans la barre système." + +msgid "To open it again, please double-click the tray icon." +msgstr "Pour l'ouvrir à nouveau, double cliquez sur l'icone." + +msgid "Click here to make this message disappear" +msgstr "Cliquez ici pour ne plus voir ce message." + +msgid "TuxBox 2.0 Show / Hide" +msgstr "Voir / Masquer TuxBox 2.0" + +msgid "TuxBox 2.0 Warning" +msgstr "TuxBox 2.0 Notification" + +msgid "Show / Hide" +msgstr "Voir / Masquer" + +msgid "Mute" +msgstr "Couper le son" + +msgid "Help" +msgstr "Aide" + +msgid "Quit" +msgstr "Quitter" + |
|
From: remi <c2m...@c2...> - 2009-07-28 14:23:24
|
Author: remi Date: 2009-07-28 16:23:05 +0200 (Tue, 28 Jul 2009) New Revision: 5210 Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po Log: * Updated some french translations Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po 2009-07-28 13:52:42 UTC (rev 5209) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po 2009-07-28 14:23:05 UTC (rev 5210) @@ -9,13 +9,13 @@ msgstr "Google Plugin Météo" msgid "Weather location" -msgstr "Localisation" +msgstr "Ville" msgid "Temperature unit" msgstr "Unité de température" msgid "Give tomorrow's weather too" -msgstr "Donner les prévisions météo" +msgstr "Donner les prévisions du lendemain" msgid "Check the weather" msgstr "Vérifier la météo" |
|
From: jerome <c2m...@c2...> - 2009-07-28 13:53:12
|
Author: jerome
Date: 2009-07-28 15:52:42 +0200 (Tue, 28 Jul 2009)
New Revision: 5209
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:
* Updated the way to stop the server.
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 13:00:59 UTC (rev 5208)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TuxUtils.pas 2009-07-28 13:52:42 UTC (rev 5209)
@@ -294,20 +294,10 @@
{#### 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;
begin
- if TuxUtils.isTuxDroidServerStarted then
- begin
- request_result := TuxUtils.DownloadHTTP(command_stop);
- result := TuxUtils.getResult(request_result);
- end
- else
- begin
- result := true;
- end;
+ ShellExecute(HWND(nil), 'open', PChar('smart_server_stop'), nil, nil, SW_HIDE);
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-28 13:00:59 UTC (rev 5208)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-07-28 13:52:42 UTC (rev 5209)
@@ -155,12 +155,14 @@
var
- Form1 : TForm1;
- url : String;
- Tray : TNotifyIconData;
- AppIcon : TIcon;
- started : boolean;
- balloonShowed : boolean;
+ Form1 : TForm1;
+ TUXBOX_CONF_FILE : string;
+ url : string;
+ language : string;
+ Tray : TNotifyIconData;
+ AppIcon : TIcon;
+ started : boolean;
+ balloonShowed : boolean;
implementation
@@ -176,6 +178,8 @@
begin
url := 'http://127.0.0.1:270/user/';
+ TUXBOX_CONF_FILE := Form1.GetTuxDroidDataBaseDirectory
+ + '\configurations\TuxBox2.0.conf';
started := false;
//Setting app icon.
@@ -197,7 +201,7 @@
gnugettext.UseLanguage('en');
TP_GlobalIgnoreClassProperty(TEmbeddedWB, 'StatusText');
TP_Ignore(self, '.StatusText');
- TranslateComponent (self);
+ TranslateComponent(self);
//Starting server if not started yet.
if not TuxUtils.isTuxDroidServerStarted() then
@@ -242,12 +246,12 @@
procedure TForm1.WMQueryEndSession(var Message: TWMQueryEndSession);
begin
- inherited;
- ConnectionChecker.Enabled := false;
- TuxUtils.stopServer();
- Shell_NotifyIcon(Nim_DELETE, @IconData);
- Application.Terminate;
- Message.Result:=1;
+ inherited;
+ ConnectionChecker.Enabled := false;
+ TuxUtils.stopServer();
+ Shell_NotifyIcon(Nim_DELETE, @IconData);
+ Application.Terminate;
+ Message.Result:=1;
end;
@@ -259,16 +263,16 @@
procedure TForm1.ShowHide1Click(Sender: TObject);
begin
if Form1.Visible then
- begin
- EmbeddedWB1.Go('about:blank');
- Form1.Visible := false;
- SetForegroundWindow(Application.Handle);
- end
+ begin
+ EmbeddedWB1.Go('about:blank');
+ Form1.Visible := false;
+ SetForegroundWindow(Application.Handle);
+ end
else
- begin
- EmbeddedWB1.Go(url);
- Form1.Visible := true;
- end;
+ begin
+ EmbeddedWB1.Go(url);
+ Form1.Visible := true;
+ end;
end;
@@ -313,8 +317,8 @@
else
begin
Mute1.ImageIndex := -1;
+ end;
end;
- end;
end;
@@ -362,9 +366,9 @@
end;
if Browser = '' then
- begin
- Exit;
- end;
+ begin
+ Exit;
+ end;
Browser := Copy(Browser, Pos('"', Browser) + 1, Length(Browser)) ;
Browser := Copy(Browser, 1, Pos('"', Browser) - 1) ;
@@ -380,28 +384,28 @@
//Clique droit de la souris
if msg.LParam = Wm_LButtonDBLCLK then
- begin
- //Showing application.
- if Form1.Visible then
- begin
- EmbeddedWB1.Go('about:blank');
- Form1.Visible := false;
- end
- else
- begin
- EmbeddedWB1.Go(url);
- Form1.Visible := true;
- SetForegroundWindow(Application.Handle);
- end;
+ begin
+ //Showing application.
+ if Form1.Visible then
+ begin
+ EmbeddedWB1.Go('about:blank');
+ Form1.Visible := false;
+ end
+ else
+ begin
+ EmbeddedWB1.Go(url);
+ Form1.Visible := true;
+ SetForegroundWindow(Application.Handle);
+ end;
- end
+ end
else if msg.LParam = Wm_RButtonDown then
- begin
- SetForegroundWindow(Handle);
- GetCursorPos(Cursor);
- PopupMenu1.Popup(Cursor.X, Cursor.Y);
- PostMessage(Handle, WM_NULL, 0, 0);
- end
+ begin
+ SetForegroundWindow(Handle);
+ GetCursorPos(Cursor);
+ PopupMenu1.Popup(Cursor.X, Cursor.Y);
+ PostMessage(Handle, WM_NULL, 0, 0);
+ end
else if msg.LParam = NIN_BALLOONUSERCLICK then
begin
@@ -418,28 +422,28 @@
options : TUserInterfaceOptions;
begin
if EmbeddedWB1.OleObject.Document.Body.ScrollHeight <= self.EmbeddedWB1.Height then
- begin
-
- if not ( DontUseScrollBars in self.EmbeddedWB1.UserInterfaceOptions ) then
begin
- options := [EnablesFormsAutoComplete,EnableThemes, DontUseScrollBars];
- EmbeddedWB1.UserInterfaceOptions := options;
- EmbeddedWB1.Refresh2;
- end;
- end
+ if not ( DontUseScrollBars in self.EmbeddedWB1.UserInterfaceOptions ) then
+ begin
+ options := [EnablesFormsAutoComplete,EnableThemes, DontUseScrollBars];
+ EmbeddedWB1.UserInterfaceOptions := options;
+ EmbeddedWB1.Refresh2;
+ end;
+ end
+
else
- begin
+ begin
- if DontUseScrollBars in self.EmbeddedWB1.UserInterfaceOptions then
- begin
- options := [EnablesFormsAutoComplete,EnableThemes];
- EmbeddedWB1.UserInterfaceOptions := options;
- EmbeddedWB1.Refresh2;
+ if DontUseScrollBars in self.EmbeddedWB1.UserInterfaceOptions then
+ begin
+ options := [EnablesFormsAutoComplete,EnableThemes];
+ EmbeddedWB1.UserInterfaceOptions := options;
+ EmbeddedWB1.Refresh2;
+ end;
+
end;
-
- end;
end;
@@ -542,7 +546,14 @@
if not started then
started := true;
end;
-
+
+ //Checking for language change.
+ if language <> TuxUtils.getUserLanguage then
+ begin
+ language := TuxUtils.getUserLanguage();
+ gnugettext.UseLanguage(language);
+ end;
+
Application.ProcessMessages;
end;
@@ -619,25 +630,24 @@
*}
function TForm1.GetAllUsersDir : string;
begin
- result := GetEnvironmentVariable('ALLUSERSPROFILE');
+ result := GetEnvironmentVariable('ALLUSERSPROFILE');
end;
{ \brief Get the Tux Droid data base directory return A string.}
function TForm1.GetTuxDroidDataBaseDirectory : string;
begin
- result := GetAllUsersDir + '\Kysoh\Tux Droid';
+ result := GetAllUsersDir + '\Kysoh\Tux Droid';
end;
{ Return true if the balloon can be showed. }
function TForm1.isBalloonCanShow() : boolean;
var
- path : string;
res : string;
F : TextFile;
+ beginPos : Integer;
begin
- path := GetTuxDroidDataBaseDirectory + '\configurations\TuxBox2.0.conf';
- if not FileExists(path) then
+ if not FileExists(TUXBOX_CONF_FILE) then
begin
//Creating state file.
Form1.setBalloonCanShow(true);
@@ -646,11 +656,23 @@
else
begin
try
- AssignFile(F, path);
+ AssignFile(F, TUXBOX_CONF_FILE);
reset(F);
readLn(F, res);
closeFile(F);
- result := strtobool(res);
+ beginPos := Pos('show_balloon=', res) + Length('show_balloon=');
+ if(beginPos <> 0) then
+ begin
+ try
+ result := strtobool(Copy(res, beginPos, SizeOf(res) - 1))
+ except
+ on e : Exception do
+ result := true;
+ end;
+ end
+ else
+ result := true;
+
except
result := true;
end;
@@ -661,15 +683,13 @@
{ Set the balloon visible or not }
procedure TForm1.setBalloonCanShow(showable : boolean);
var
- path : string;
F : TextFile;
begin
{$i+}
- path := GetTuxDroidDataBaseDirectory + '\configurations\TuxBox2.0.conf';
try
- AssignFile(F, path);
+ AssignFile(F, TUXBOX_CONF_FILE);
rewrite(F);
- writeLn(F, booltostr(showable));
+ writeLn(F, 'show_balloon=' + booltostr(showable));
closeFile(F);
except
|
|
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;
|
|
From: remi <c2m...@c2...> - 2009-07-28 12:41:29
|
Author: remi Date: 2009-07-28 14:41:18 +0200 (Tue, 28 Jul 2009) New Revision: 5207 Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.xml Log: * Added "platform" argument (only for windows) in the plugin.xml file of the Facebook gadget. Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.xml =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.xml 2009-07-28 12:39:24 UTC (rev 5206) +++ software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/resources/plugin.xml 2009-07-28 12:41:18 UTC (rev 5207) @@ -10,6 +10,7 @@ <author>Jerome Conan</author> <version>1.0</version> <iconFile>resources/plugin.png</iconFile> + <platform>windows</platform> <executionMode>command</executionMode> <uuid>1f0f6400-49ee-11de-8a39-0800200c9a66</uuid> </description> |
|
From: remi <c2m...@c2...> - 2009-07-28 12:39:44
|
Author: remi
Date: 2009-07-28 14:39:24 +0200 (Tue, 28 Jul 2009)
New Revision: 5206
Modified:
software_suite_v3/software/plugin/plugin-WMP/trunk/pom.xml
software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml
software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/pom.xml
software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/pom.xml
software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/pom.xml
software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/pom.xml
Log:
* Added "attitunes" directory in the scp compilation for some java gadgets.
Modified: software_suite_v3/software/plugin/plugin-WMP/trunk/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-WMP/trunk/pom.xml 2009-07-28 12:39:17 UTC (rev 5205)
+++ software_suite_v3/software/plugin/plugin-WMP/trunk/pom.xml 2009-07-28 12:39:24 UTC (rev 5206)
@@ -77,6 +77,7 @@
todir="./libraries" />
<zip destfile="./${project.artifactId}.scp">
<zipfileset dir="." includes="resources/*" />
+ <zipfileset dir="." includes="resources/attitunes/*" />
<zipfileset dir="." includes="libraries/*" >
<exclude name="libraries/tuxdroid-plugin-java-kit*" />
<exclude name="libraries/karmalab-commons*" />
Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml 2009-07-28 12:39:17 UTC (rev 5205)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/pom.xml 2009-07-28 12:39:24 UTC (rev 5206)
@@ -85,6 +85,7 @@
todir="./libraries" />
<zip destfile="./${project.artifactId}.scp">
<zipfileset dir="." includes="resources/*" />
+ <zipfileset dir="." includes="resources/attitunes/*" />
<zipfileset dir="." includes="libraries/*" >
<exclude name="libraries/tuxdroid-plugin-java-kit*" />
<exclude name="libraries/karmalab-commons*" />
Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/pom.xml 2009-07-28 12:39:17 UTC (rev 5205)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/plugin-facebook/pom.xml 2009-07-28 12:39:24 UTC (rev 5206)
@@ -117,6 +117,7 @@
todir="./libraries" />
<zip destfile="./${project.artifactId}.scp">
<zipfileset dir="." includes="resources/*" />
+ <zipfileset dir="." includes="resources/attitunes/*" />
<zipfileset dir="." includes="libraries/*" >
<exclude name="libraries/tuxdroid-plugin-java-kit*" />
<exclude name="libraries/karmalab-commons*" />
Modified: software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/pom.xml 2009-07-28 12:39:17 UTC (rev 5205)
+++ software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/pom.xml 2009-07-28 12:39:24 UTC (rev 5206)
@@ -71,6 +71,7 @@
todir="./libraries" />
<zip destfile="./${project.artifactId}.scp">
<zipfileset dir="." includes="resources/*" />
+ <zipfileset dir="." includes="resources/attitunes/*" />
<zipfileset dir="." includes="libraries/*" >
<exclude name="libraries/tuxdroid-plugin-java-kit*" />
<exclude name="libraries/karmalab-commons*" />
Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/pom.xml 2009-07-28 12:39:17 UTC (rev 5205)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/pom.xml 2009-07-28 12:39:24 UTC (rev 5206)
@@ -76,6 +76,7 @@
todir="./libraries" />
<zip destfile="./${project.artifactId}.scp">
<zipfileset dir="." includes="resources/*" />
+ <zipfileset dir="." includes="resources/attitunes/*" />
<zipfileset dir="." includes="libraries/*" >
<exclude name="libraries/tuxdroid-plugin-java-kit*" />
</zipfileset>
Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/pom.xml 2009-07-28 12:39:17 UTC (rev 5205)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/pom.xml 2009-07-28 12:39:24 UTC (rev 5206)
@@ -85,6 +85,7 @@
todir="./libraries" />
<zip destfile="./${project.artifactId}.scp">
<zipfileset dir="." includes="resources/*" />
+ <zipfileset dir="." includes="resources/attitunes/*" />
<zipfileset dir="." includes="libraries/*" >
<exclude name="libraries/tuxdroid-plugin-java-kit*" />
<exclude name="libraries/karmalab-commons*" />
|
1 message has been excluded from this view by a project administrator.
