tux-droid-svn Mailing List for Tux Droid CE (Page 37)
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-22 09:22:07
|
Author: jerome
Date: 2009-07-22 11:22:03 +0200 (Wed, 22 Jul 2009)
New Revision: 5130
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:
* Changed popup menu caption.
* Changed the way to display the TuxBox 2.0 ( simple click => Double click
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-22 09:19:25 UTC (rev 5129)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-07-22 09:22:03 UTC (rev 5130)
@@ -1,6 +1,6 @@
object Form1: TForm1
- Left = 266
- Top = 184
+ Left = 267
+ Top = 168
Width = 1024
Height = 768
Caption = 'TuxBox 2.0'
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-22 09:19:25 UTC (rev 5129)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-07-22 09:22:03 UTC (rev 5130)
@@ -109,7 +109,7 @@
Form1.Icon := AppIcon;
Tray.hIcon := Application.Icon.handle;
- Tray.szTip := 'Show/Hide Tux Droid Browser';
+ Tray.szTip := 'Show/Hide TuxBox 2.0';
Tray.uFlags := nif_message or nif_icon or nif_tip;
//Adding tray icon to the system tray.
@@ -248,20 +248,20 @@
begin
//Clique droit de la souris
- if msg.LParam = Wm_LButtonDown then
+ if msg.LParam = Wm_LButtonDBLCLK then
begin
- //Showing application.
+ //Showing application.
if Form1.Visible then
- begin
- Form1.Visible := false;
- ShowHide1.Caption := 'Show';
- end
+ begin
+ Form1.Visible := false;
+ ShowHide1.Caption := 'Show';
+ end
else
- begin
- Form1.Visible := true;
- ShowHide1.Caption := 'Hide';
- SetForegroundWindow(Application.Handle);
- end;
+ begin
+ Form1.Visible := true;
+ ShowHide1.Caption := 'Hide';
+ SetForegroundWindow(Application.Handle);
+ end;
end
else if msg.LParam = Wm_RButtonDown then
@@ -379,6 +379,8 @@
end;
+
+{### Event used to show or not the scroll bar ###}
procedure TForm1.EmbeddedWB1DocumentComplete(ASender: TObject;
const pDisp: IDispatch; var URL: OleVariant);
var
|
|
From: remi <c2m...@c2...> - 2009-07-22 09:19:32
|
Author: remi
Date: 2009-07-22 11:19:25 +0200 (Wed, 22 Jul 2009)
New Revision: 5129
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
Log:
* Redirect to "All gadgets filter" in the "gadgets" page after gadget duplication.
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-07-22 08:59:18 UTC (rev 5128)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-07-22 09:19:25 UTC (rev 5129)
@@ -478,12 +478,19 @@
function applyUgc()
{
- newGadgetOnEdit = false;
if (window.frames.windowGadgetConfigurationContentIFrame && window.frames.windowGadgetConfigurationContentIFrame.applyGadgetConfiguration)
{
window.frames.windowGadgetConfigurationContentIFrame.applyGadgetConfiguration();
}
- fillGadgetRows(knowedGadgetsFilter);
+ if (newGadgetOnEdit)
+ {
+ newGadgetOnEdit = false;
+ fillGadgetRows('all_gadgets');
+ }
+ else
+ {
+ fillGadgetRows(knowedGadgetsFilter);
+ }
}
function abortApplyUgc()
|
|
From: jerome <c2m...@c2...> - 2009-07-22 08:59:33
|
Author: jerome Date: 2009-07-22 10:59:18 +0200 (Wed, 22 Jul 2009) New Revision: 5128 Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm Log: * Changed app title : Tux Droid browser ==> TuxBox 2.0 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-22 08:55:21 UTC (rev 5127) +++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-07-22 08:59:18 UTC (rev 5128) @@ -3,7 +3,7 @@ Top = 184 Width = 1024 Height = 768 - Caption = 'Tux Droid Browser' + Caption = 'TuxBox 2.0' Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText |
|
From: jerome <c2m...@c2...> - 2009-07-22 08:55:37
|
Author: jerome
Date: 2009-07-22 10:55:21 +0200 (Wed, 22 Jul 2009)
New Revision: 5127
Added:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/bmp/
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/bmp/tick_trans.bmp
Removed:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.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
Log:
* Changed tick icon format to make use of image list component instead of png image list component.
* Changed default start page : Devel ==> User.
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.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-22 08:52:32 UTC (rev 5126)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-07-22 08:55:21 UTC (rev 5127)
@@ -67,8 +67,14 @@
DisabledPopupMenus = [rcmAll]
About = ' EmbeddedWB http://bsalsa.com/'
DisabledPopupMenuItems = [rcsOpenNWindow, rcsOpenLink]
+ PrintOptions.Margins.Left = 19.05
+ PrintOptions.Margins.Right = 19.05
+ PrintOptions.Margins.Top = 19.05
+ PrintOptions.Margins.Bottom = 19.05
+ PrintOptions.Header = '&w&bPage &p of &P'
PrintOptions.HTMLHeader.Strings = (
'<HTML></HTML>')
+ PrintOptions.Footer = '&u&b&d'
PrintOptions.Orientation = poPortrait
VisualEffects.DisableSounds = True
ControlData = {
@@ -87,7 +93,7 @@
SimplePanel = False
end
object PopupMenu1: TPopupMenu
- Images = PngImageList1
+ Images = ImageList1
OnPopup = PopupMenu1Popup
Left = 8
Top = 8
@@ -111,117 +117,11 @@
OnClick = Quit1Click
end
end
- object PngImageList1: TPngImageList
- PngImages = <
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 6100000A4F6943435050686F746F73686F70204943432070726F66696C650000
- 78DA9D53675453E9163DF7DEF4424B8880944B6F5215082052428B801491262A
- 2109104A8821A1D91551C1114545041BC8A088038E8E808C15512C0C8A0AD807
- E421A28E83A3888ACAFBE17BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C008
- 0C9648335135800CA9421E11E083C7C4C6E1E42E40810A2470001008B3642173
- FD230100F87E3C3C2B22C007BE000178D30B0800C04D9BC0301C87FF0FEA4299
- 5C01808401C07491384B08801400407A8E42A600404601809D98265300A00400
- 60CB6362E300502D0060277FE6D300809DF8997B01005B94211501A091002013
- 65884400683B00ACCF568A450058300014664BC43900D82D00304957664800B0
- B700C0CE100BB200080C00305188852900047B0060C8232378008499001446F2
- 573CF12BAE10E72A00007899B23CB9243945815B082D710757572E1E28CE4917
- 2B14366102619A402EC27999193281340FE0F3CC0000A0911511E083F3FD78CE
- 0EAECECE368EB60E5F2DEABF06FF226262E3FEE5CFAB70400000E1747ED1FE2C
- 2FB31A803B06806DFEA225EE04685E0BA075F78B66B20F40B500A0E9DA57F370
- F87E3C3C45A190B9D9D9E5E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E
- 3CFCF7F5E0BEE22481325D814704F8E0C2CCF44CA51CCF92098462DCE68F47FC
- B70BFFFC1DD322C44962B9582A14E35112718E449A8CF332A52289429229C525
- D2FF64E2DF2CFB033EDF3500B06A3E017B912DA85D6303F64B27105874C0E2F7
- 0000F2BB6FC1D4280803806883E1CF77FFEF3FFD47A02500806649927100005E
- 44242E54CAB33FC708000044A0812AB0411BF4C1182CC0061CC105DCC10BFC60
- 36844224C4C24210420A64801C726029AC82422886CDB01D2A602FD4401D34C0
- 51688693700E2EC255B80E3D700FFA61089EC128BC81090441C808136121DA88
- 01628A58238E08179985F821C14804128B2420C9881451224B91354831528A54
- 2055481DF23D720239875C46BA913BC8003282FC86BC47319481B2513DD40CB5
- 43B9A8371A8446A20BD06474319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA
- 8F3E43C730C0E8180733C46C302EC6C342B1382C099363CBB122AC0CABC61AB0
- 56AC03BB89F563CFB17704128145C0093604774220611E4148584C584ED848A8
- 201C243411DA093709038451C2272293A84BB426BA11F9C4186232318758482C
- 23D6128F132F107B8843C437241289433227B9900249B1A454D212D246D26E52
- 23E92CA99B34481A2393C9DA646BB20739942C202BC885E49DE4C3E433E41BE4
- 21F25B0A9D624071A4F853E22852CA6A4A19E510E534E5066598324155A39A52
- DDA8A15411358F5A42ADA1B652AF5187A81334759A39CD8316494BA5ADA295D3
- 1A681768F769AFE874BA11DD951E4E97D057D2CBE947E897E803F4770C0D8615
- 83C7886728199B18071867197718AF984CA619D38B19C754303731EB98E7990F
- 996F55582AB62A7C1591CA0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB
- 548FA95E537DAE46553353E3A909D496AB55AA9D50EB531B5367A93BA887AA67
- A86F543FA47E59FD890659C34CC34F43A451A0B15FE3BCC6200B6319B3782C21
- 6B0DAB86758135C426B1CDD97C762ABB98FD1DBB8B3DAAA9A13943334A3357B3
- 52F394663F07E39871F89C744E09E728A797F37E8ADE14EF29E2291BA6344CB9
- 31655C6BAA96979658AB48AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C7
- 4A275C2747678FCE059DE753D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB44
- 77BF6EA7EE989EBE5E809E4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C58
- 06B30C2406DB0CCE183CC535716F3C1D2FC7DBF151435DC34043A561956197E1
- 8491B9D13CA3D5468D460F8C69C65CE324E36DC66DC6A326062621264B4DEA4D
- EE9A524DB9A629A63B4C3B4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79B
- DFB7605A785A2CB6A8B6B86549B2E45AA659EEB6BC6E855A3959A558555A5DB3
- 46AD9DAD25D6BBADBBA711A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D8
- 06DBAEB66DB67D6167621767B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB
- 1D5A1D7E73B472143A563ADE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B6
- 13CB29C4699D539BD347671767B97383F3888B894B82CB2E973E2E9B1BC6DDC8
- BDE44A74F5715DE17AD2F59D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F29
- 9E593373D0C3C843E051E5D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F
- 9157ADD7B0B7A577AAF761EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7
- C8B7CB4FC36F9E5F85DF437F23FF64FF7AFFD100A78025016703898141815B02
- FBF87A7C21BF8E3F3ADB65F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8
- EC90AD21F7E798CE91CE690E85507EE8D6D00761E6618BC37E0C278587855786
- 3F8E7088581AD131973577D1DC4373DF44FA449644DE9B67314F39AF2D4A352A
- 3EAA2E6A3CDA37BA34BA3FC62E6659CCD5589D58496C4B1C392E2AAE366E6CBE
- DFFCEDF387E29DE20BE37B17982FC85D7079A1CEC2F485A716A92E122C3A9640
- 4C884E3894F041102AA8168C25F21377258E0A79C21DC267222FD136D188D843
- 5C2A1E4EF2482A4D7A92EC91BC357924C533A52CE5B98427A990BC4C0D4CDD9B
- 3A9E169A76206D323D3ABD31839291907142AA214D93B667EA67E66676CBAC65
- 85B2FEC56E8BB72F1E9507C96BB390AC05592D0AB642A6E8545A28D72A07B267
- 655766BFCD89CA3996AB9E2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5
- 864B572D1D58E6BDAC6A39B23C7179DB0AE315052B865606AC3CB88AB62A6DD5
- 4FABED5797AE7EBD267A4D6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED
- 5D4F582F59DFB561FA869D1B3E15898AAE14DB1797157FD828DC78E51B876FCA
- BF99DC94B4A9ABC4B964CF66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB4
- 0DDF56B4EDF5F645DB2F97CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54
- A454F454FA5436EED2DDB561D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BE
- DB5501554DD566D565FB49FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D2
- 03FD07230EB6D7B9D4D51DD23D54528FD62BEB470EC71FBEFE9DEF772D0D360D
- 558D9CC6E223704479E4E9F709DFF71E0D3ADA768C7BACE107D31F761D671D2F
- 6A429AF29A469B539AFB5B625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C5979
- 4AF354C969DAE982D39367F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A
- 0F6FEFBA1074E1D245FF8BE73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F
- 6DEA74EA3CFE93D34FC7BB9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDD
- F4BD79F116FFD6D59E393DDDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD977
- 27EEADBC4FBC5FF440ED41D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47
- F7068583CFFE91F58F0F43058F998FCB860D86EB9E383E3939E23F72FDE9FCA7
- 43CF64CF269E17FEA2FECBAE17162F7EF8D5EBD7CED198D1A197F29793BF6D7C
- A5FDEAC0EB19AFDBC6C2C61EBEC97833315EF456FBEDC177DC771DEFA3DF0F4F
- E47C207F28FF68F9B1F553D0A7FB93199393FF040398F3FC63332DDB00000006
- 624B474400FF00FF00FFA0BDA793000000097048597300000B1300000B130100
- 9A9C180000000774494D45000000000000000973942E000001284944415478DA
- A5D22D4803611CC7F1E71414C1248288CC3235C892C56A5F1988061918846950
- D4BA64D0A6C16690812F283A652062512C06591908B398560483C1200716E7F7
- F0F7C0C3C3CDC1F9870FDC3D2FBF7B5E2E30FFAC20C19C71A451C36B92806DCC
- 630997ED02A2FEA69E87308B75A43087D3C019D8896F89AB02F634F643ABB8B2
- 019358C02DCADEC43E7D35878CD33E830B1B90C751948845BCA9BD4303F7D1EB
- 4C7EC61AEE6CC0344ED0857BACA28E2D850F3B938FB18317843620A7801EBD6F
- A08A5D8CA92DC413367163CFCE5DC1B9961CD53BBED08F6EB55D63050DFF9A8C
- 0E273AC42C46BD430CB5AD122A71F7EC5651FB76EB5177DE3031E5078C98DF9F
- 65198338C3A1B3E7B601B60E30A5B0AAF9A35A054C60000FF84C12E08F69B6EA
- FC01240D3712AFF555E00000000049454E44AE426082}
- Name = 'PngImage0'
- Background = clWindow
- end>
- Left = 40
- Top = 8
- end
object ImageList1: TImageList
Left = 72
Top = 8
Bitmap = {
- 494C010105000900040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+ 494C010106000900040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
0000000000003600000028000000400000003000000001002000000000000030
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -354,124 +254,124 @@
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000002D1307FF2D1307FF2D1307FF180B05FF0F252BFF0940
4FFF404040FF0000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000FEFEFE0000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
0000592811FF70422CFF997868FFAD9387FFAD9387FF070F11FF1ABFEDFF1CCC
FDFF17A6CEFF13292FFF00000000000000000000000000000000000000000000
+ 000000000000CDCDCD00B6B6B600F3F3F3000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000987868FF6535
1DFFA3724AFFD8B48DFFD4AD82FFE0C3A4FF989089FF0E667FFF1CCCFDFF1CCC
FDFF1CCCFDFF19B3DDFF111D1FFF000000000000000000000000000000000000
+ 0000000000005E5E5E001E1E1E00C8C8C8000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000A38577FF683315FFD3B7
9DFFDCBC99FFC18749FFC18749FFC18749FF1A1E19FF1ABFEDFF1CCCFDFF1CCC
- FDFF1CCCFDFF1CCCFDFF1599BEFF606060FF0000000000000000000000000000
+ FDFF1CCCFDFF1CCCFDFF1599BEFF606060FF000000000000000000000000DBDB
+ DB0085858500191919000000000057575700B5B5B50000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000005B270EFFAE753EFFE0C3
A4FFFBF8F4FFE4CBAFFFC58F54FF79542EFF0E667FFF1CCCFDFF1CCCFDFF1CCC
- FDFF1CCCFDFF1CCCFDFF1CCCFDFF05262FFF0000000000000000000000000000
+ FDFF1CCCFDFF1CCCFDFF1CCCFDFF05262FFF0000000000000000000000008585
+ 85000000000000000000000000000000000039393900DFDFDF00000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000987868FF814B24FFC58F54FFFBF8
F4FFFFFFFFFFFFFFFFFFE0C3A4FF48331BFF17A6CEFF1CCCFDFF1CCCFDFF1CCC
- FDFF1CCCFDFF1CCCFDFF1CCCFDFF0C596FFF0000000000000000000000000000
+ FDFF1CCCFDFF1CCCFDFF1CCCFDFF0C596FFF00000000D3D3D300707070002525
+ 2500000000000000000000000000000000000A0A0A004C4C4C00AEAEAE000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000065341DFFAE753EFFD1A577FFFFFF
FFFFFFFFFFFFFFFFFFFFDCBC99FF3C2A17FF19B3DDFF1CCCFDFF1CCCFDFF1CCC
- FDFF1CCCFDFF17A6CEFF138CAEFF0C2228FF0000000000000000000000000000
+ FDFF1CCCFDFF17A6CEFF138CAEFF0C2228FF00000000ACACAC00020202000000
+ 000000000000141414001B1B1B000707070000000000000000004C4C4C00DFDF
+ DF00000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000005B270EFFC18749FFC99660FFFFFF
FFFFF7F0E8FFD8B48DFFC18749FF956D42FF132930FF09404FFF303030FF1329
- 30FF09404FFF302212FF472C16FF241007FF0000000000000000000000000000
+ 30FF09404FFF302212FF472C16FF241007FF00000000AFAFAF00090909000000
+ 00000000000080808000B7B7B7002626260000000000000000000A0A0A003939
+ 3900B5B5B5000000000000000000FEFEFE000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000005B270EFFC99660FFF7F0E8FFE8D2
BBFFD1A577FFC18749FFC18749FFE0C3A4FFEFEFEFFFEFEFEFFFFFFFFFFFFFFF
- FFFFEFEFEFFFC58F54FF8E572CFF2D1307FF0000000000000000000000000000
+ FFFFEFEFEFFFC58F54FF8E572CFF2D1307FF00000000ACACAC00060606000000
+ 000042424200D3D3D300000000007A7A7A001E1E1E0000000000000000000000
+ 00005C5C5C00CFCFCF00F5F5F500000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000005B270EFFD6B695FFF7F0E8FFF0E1
D2FFC18749FFC18749FFC18749FFD4AD82FFFFFFFFFFF7F0E8FFFBF8F4FFFFFF
- FFFFFFFFFFFFF3E9DDFF814B24FF2D1307FF0000000000000000000000000000
+ FFFFFFFFFFFFF3E9DDFF814B24FF2D1307FF00000000A3A3A300000000004E4E
+ 4E00E7E7E7000000000000000000FDFDFD00A8A8A8000C0C0C00000000000000
+ 0000000000002B2B2B00BBBBBB00000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000794F3BFFB29077FFFFFFFFFFFBF8
F4FFC58F54FFC18749FFC18749FFDCBC99FFFBF8F4FFF3E9DDFFFFFFFFFFFFFF
- FFFFFBF8F4FFFFFFFFFF65351DFF000000000000000000000000000000000000
+ FFFFFBF8F4FFFFFFFFFF65351DFF0000000000000000C8C8C80065656500AAAA
+ AA0000000000000000000000000000000000EDEDED007C7C7C002C2C2C000000
+ 00000000000000000000ABABAB00000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000AC9286FF764830FFFBF8F4FFFFFF
FFFFE8D2BBFFCD9E6BFFC18749FFC58F54FFECDAC6FFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFC2AEA5FF51222AFF000000000000000000000000000000000000
+ FFFFFFFFFFFFC2AEA5FF51222AFF0000000000000000FEFEFE00FBFBFB00FDFD
+ FD00000000000000000000000000000000000000000000000000999999000101
+ 01000000000010101000B1B1B100000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000004F220CFFA98C7BFFFFFF
FFFFFFFFFFFFF7F0E8FFCD9E6BFFC18749FFDCBC99FFE8D2BBFFFFFFFFFFFFFF
FFFFDCCFC6FF65351DFF00000000000000000000000000000000000000000000
+ 0000000000000000000000000000FEFEFE000000000000000000E4E4E4008E8E
+ 8E001D1D1D0000000000A6A6A600000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000552410FFA98C
7BFFECDAC6FFFBF8F4FFFBF8F4FFD4AD82FFC18749FFC58F54FFE0C3A4FFBD93
6BFF612D12FF381808FF00000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 00007373730014141400ACACAC00000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000004F22
0CFF6E3919FFAE896CFFD2AE8AFFC18749FFC18749FFAE753EFF814B24FF5B27
0EFFA38577FF0000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 0000D5D5D500B2B2B200E4E4E400000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
0000AC9286FF794F3BFF5B270EFF5B270EFF5B270EFF65341DFF987868FF0000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -613,16 +513,15 @@
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 00000000000000000000000000000000FC07000000000000F003000000000000
- C001000000000000800000000000000080000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 000100000000000000010000000000008003000000000000C003000000000000
- E007000000000000F01F000000000000FC3FFC3FFC3FFC3FF81FF81FF81FF81F
+ 00000000000000000000000000000000FC07FF7F00000000F003F8FF00000000
+ C001F8FF000000008000E07F000000008000E03F000000000000801F00000000
+ 0000800F00000000000080060000000000008201000000000000860100000000
+ 00018F010000000000018FC1000000008003FEC100000000C003FFF100000000
+ E007FFF100000000F01FFFFF00000000FC3FFC3FFC3FFC3FF81FF81FF81FF81F
F00FF00FF00FF00FF007F007F007F007E003E003E003E003E001E001E001E001
C001C001C001C001C000C000C000C00080008000800080008000800080008000
8000800080008000800080008000800080008000800080008001800180018001
- C21FC21FC21FC21FFFFFFFFFFFFFFFFF00000000000000000000000000000000
- 000000000000}
+ C21FC21FC21FC21FFFFFFFFFFFFFFFFF}
end
object XmlScanner1: TXmlScanner
Normalize = True
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-22 08:52:32 UTC (rev 5126)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-07-22 08:55:21 UTC (rev 5127)
@@ -28,8 +28,8 @@
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, OleCtrls, SHDocVw_EWB, EwbCore, EmbeddedWB, ShellAPI, Menus, Registry,
- ImgList, PngImageList, LibXmlParser, LibXmlComps, IEDownload, ExtCtrls, TlHelp32,
- EwbControlComponent, TXmlThread, ComCtrls, AppEvnts;
+ ImgList, LibXmlParser, LibXmlComps, IEDownload, ExtCtrls, TlHelp32,
+ EwbControlComponent, TXmlThread, ComCtrls, AppEvnts, PngImageList;
const wm_AppelMessage = wm_user + 1;
@@ -42,7 +42,6 @@
Help1: TMenuItem;
N1: TMenuItem;
Quit1: TMenuItem;
- PngImageList1: TPngImageList;
ImageList1: TImageList;
XmlScanner1: TXmlScanner;
EwbControl1: TEwbControl;
@@ -94,7 +93,7 @@
var
options : TUserInterfaceOptions;
begin
- url := 'http://127.0.0.1:270/devel/';
+ url := 'http://127.0.0.1:270/user/';
radioState := false;
@@ -181,9 +180,9 @@
procedure TForm1.Mute1Click(Sender: TObject);
begin
{TODO : Update this code when tuxdroid server can sent mute states.}
- if Mute1.ImageIndex <> 0 then
+ if Mute1.ImageIndex <> 5 then
begin
- Mute1.ImageIndex := 0;
+ Mute1.ImageIndex := 5;
end
else
begin
Added: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/bmp/tick_trans.bmp
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/bmp/tick_trans.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
|
From: remi <c2m...@c2...> - 2009-07-22 08:52:46
|
Author: remi
Date: 2009-07-22 10:52:32 +0200 (Wed, 22 Jul 2009)
New Revision: 5126
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
Log:
* Duplicated gadget is deleted if you click on the button "cancel" in the configuration page.
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-07-22 07:48:21 UTC (rev 5125)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-07-22 08:52:32 UTC (rev 5126)
@@ -43,6 +43,7 @@
var lastGadgetUuidInAction = "0";
var lastGadgetNameInAction = "0";
var lastGadgetIconInAction = "0";
+ var newGadgetOnEdit = false;
var translationStart = "";
var translationStop = ""
var translationDelete = "";
@@ -455,6 +456,7 @@
{
lastIdx = gadgetsCount - 1;
lastUuid = uuid = gadgets.get("data0").get("gadget_" + lastIdx + "_uuid");
+ newGadgetOnEdit = true;
clickMe("configureId_" + lastUuid);
}
}
@@ -476,12 +478,26 @@
function applyUgc()
{
+ newGadgetOnEdit = false;
if (window.frames.windowGadgetConfigurationContentIFrame && window.frames.windowGadgetConfigurationContentIFrame.applyGadgetConfiguration)
{
window.frames.windowGadgetConfigurationContentIFrame.applyGadgetConfiguration();
}
fillGadgetRows(knowedGadgetsFilter);
}
+
+ function abortApplyUgc()
+ {
+ if (newGadgetOnEdit)
+ {
+ newGadgetOnEdit = false;
+ deleteUgc();
+ }
+ else
+ {
+ newGadgetOnEdit = false;
+ }
+ }
]]>
</script>
</head>
@@ -666,13 +682,13 @@
<xsl:element name="a">
<xsl:attribute name="class">windowBtn</xsl:attribute>
<xsl:attribute name="name">lbOff</xsl:attribute>
+ <xsl:attribute name="onclick">javascript:abortApplyUgc();</xsl:attribute>
<xsl:attribute name="rel">deactivate</xsl:attribute>
<xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/cancel"/>
</xsl:element>
</div>
<div class="windowFrame01Bottom"></div>
</div>
-
</body>
</html>
</xsl:template>
|
|
From: remi <c2m...@c2...> - 2009-07-22 07:48:50
|
Author: remi
Date: 2009-07-22 09:48:21 +0200 (Wed, 22 Jul 2009)
New Revision: 5125
Modified:
software_suite_v3/smart-core/smart-server/trunk/installer.nsi
software_suite_v3/smart-core/smart-server/trunk/version.py
Log:
* Updated to 0.4.1-b7
Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-17 15:59:53 UTC (rev 5124)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-22 07:48:21 UTC (rev 5125)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.1-b6"
+!define PRODUCT_VERSION "0.4.1-b7"
; 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-17 15:59:53 UTC (rev 5124)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py 2009-07-22 07:48:21 UTC (rev 5125)
@@ -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-b6'
+version = '0.4.1-b7'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
|
From: remi <c2m...@c2...> - 2009-07-17 16:00:12
|
Author: remi
Date: 2009-07-17 17:59:53 +0200 (Fri, 17 Jul 2009)
New Revision: 5124
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/00_resourceAttituneManager.py
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/01_resourcePluginsServer.py
software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcContainer.py
Log:
* Added introduction of alerts with Attitunes
* Fixed bug with "Attitunes" page. (Start/Edit of attitunes with special chars in the name)
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl 2009-07-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl 2009-07-17 15:59:53 UTC (rev 5124)
@@ -107,6 +107,39 @@
</div>
</xsl:if>
</xsl:for-each>
+ <!-- GADGET ALERT ATTITUNE -->
+ <xsl:if test="root/data/showAlertAttitune = 'True'">
+ <div class="gadgetConfContentFrameMiddle">
+ <div class="gadgetConfContentFrameSep"></div>
+ <xsl:element name="input">
+ <xsl:attribute name="class">text</xsl:attribute>
+ <xsl:attribute name="type">hidden</xsl:attribute>
+ <xsl:attribute name="id">req_param_<xsl:value-of select="name"/>_visible</xsl:attribute>
+ <xsl:attribute name="value">true</xsl:attribute>
+ </xsl:element>
+ <span class="gadgetConfParamName">
+ <xsl:value-of select="root/translations/introduction_alerts"/>
+ </span>
+ <span class="gadgetConfParamValue">
+ <xsl:element name="select">
+ <xsl:attribute name="class">select</xsl:attribute>
+ <xsl:attribute name="id">req_alertAttitune</xsl:attribute>
+ <xsl:attribute name="name">AlertAttitune</xsl:attribute>
+ <xsl:for-each select="root/data/availableAttitunes/*">
+ <xsl:element name="option">
+ <xsl:attribute name="value">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ <xsl:if test=". = ../../alertAttitune">
+ <xsl:attribute name="selected">true</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="."/>
+ </xsl:element>
+ </xsl:for-each>
+ </xsl:element>
+ </span>
+ </div>
+ </xsl:if>
<div class="gadgetConfContentFrameBottom"></div>
<!-- ON DEMAND -->
<xsl:choose>
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/00_resourceAttituneManager.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/00_resourceAttituneManager.py 2009-07-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/00_resourceAttituneManager.py 2009-07-17 15:59:53 UTC (rev 5124)
@@ -260,8 +260,14 @@
return False
attituneExists = False
attitunes = self.getAttitunesContainer().getAttitunes()
+ reencodedName = name
+ try:
+ tmp = reencodedName.decode("latin-1")
+ reencodedName = tmp.encode("utf-8")
+ except:
+ pass
for attitune in attitunes:
- if attitune.getDescription().getName() == name:
+ if attitune.getDescription().getName() in [name, reencodedName]:
attituneExists = True
break
if not attituneExists:
@@ -299,8 +305,14 @@
return False
attituneExists = False
attitunes = self.getAttitunesContainer().getAttitunes()
+ reencodedName = name
+ try:
+ tmp = reencodedName.decode("latin-1")
+ reencodedName = tmp.encode("utf-8")
+ except:
+ pass
for attitune in attitunes:
- if attitune.getDescription().getName() == name:
+ if attitune.getDescription().getName() in [name, reencodedName]:
attituneExists = True
break
if not attituneExists:
@@ -337,6 +349,17 @@
t = threading.Thread(target = async)
t.start()
+ def getAttitunesNameByObserversList(self, observersList):
+ """
+ """
+ attitunes = self.getAttitunesContainer().getAttitunes()
+ namesList = []
+ for attitune in attitunes:
+ if attitune.getObserverName() in observersList:
+ namesList.append(attitune.getDescription().getName())
+ namesList.sort()
+ return namesList
+
def getAttitunesDictAll(self):
"""
"""
@@ -344,12 +367,7 @@
self.__setAttituneRunName("0")
result = {}
count = 0
- attitunes = self.getAttitunesContainer().getAttitunes()
- namesList = []
- for attitune in attitunes:
- if attitune.getObserverName() in ["attitunes", "userAttitunes"]:
- namesList.append(attitune.getDescription().getName())
- namesList.sort()
+ namesList = self.getAttitunesNameByObserversList(["attitunes", "userAttitunes"])
for attName in namesList:
attitune = self.getAttitunesContainer().getAttitune(attName)
result["attitune_%d_name" % count] = attName
@@ -358,7 +376,7 @@
count += 1
result['count'] = count
return result
-
+
def checkForUpdates(self):
"""
"""
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/01_resourcePluginsServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/01_resourcePluginsServer.py 2009-07-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/01_resourcePluginsServer.py 2009-07-17 15:59:53 UTC (rev 5124)
@@ -116,7 +116,7 @@
"attitunes")
if os.path.isdir(pluginAttPath):
resourceAttituneManager.getAttitunesContainer().addDirectory(
- pluginAttPath)
+ pluginAttPath, uuid)
self.logger.logDebug("Plugin deployed [%s] to [%s]" % (
plugin.getDescription().getName(), pluginWorkingPath))
self.__publishEvents(False, ST_NAME_PS_PLUGIN_LOADED, [uuid,])
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-07-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/00_resourceRobotContentInteractions.py 2009-07-17 15:59:53 UTC (rev 5124)
@@ -308,10 +308,21 @@
"""
if not self.getPluginCommand().isNotifier():
if self.getContextLayer() == PGU_CONTEXT_LAYER_SCHEDULER:
- resourceTuxDriver.playSound(14, 100.0)
+ introAtt = None
+ try:
+ introAtt = self.getPguObject().getAlertAttitune()
+ if introAtt == "----":
+ introAtt = None
+ except:
+ pass
+ if introAtt != None:
+ self.__executeAttitune(introAtt)
+ else:
+ resourceTuxDriver.playSound(14, 100.0)
+ time.sleep(0.5)
else:
resourceTuxDriver.playSound(13, 100.0)
- time.sleep(0.5)
+ time.sleep(0.5)
while self.executionIsStarted():
while self.executionIsPaused():
time.sleep(0.1)
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-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py 2009-07-17 15:59:53 UTC (rev 5124)
@@ -362,6 +362,28 @@
if data == None:
contentStruct['root']['result'] = getStrError(E_TDREST_FAILED)
else:
+ # Complete data with available alert attitunes
+ # Check for alert type
+ showAttitunes = False
+ ugc = resourceUgcServer.getUgcContainer().getUgcByUuid(uuid)
+ parentPlugin = ugc.getParentGadget().getParentPlugin()
+ tasks = ugc.getTasks()
+ for task in tasks:
+ parentTask = parentPlugin.getTask(task.getName())
+ if parentTask != None:
+ parentCommand = parentPlugin.getCommand(parentTask.getCommand())
+ if parentCommand != None:
+ if not parentCommand.isNotifier():
+ showAttitunes = True
+ break
+ data['showAlertAttitune'] = showAttitunes
+ parentUuid = parentPlugin.getDescription().getUuid()
+ attitunesList = resourceAttituneManager.getAttitunesNameByObserversList([parentUuid, "userAttitunes"])
+ attitunesList.insert(0, "----")
+ data['availableAttitunes'] = {}
+ for i, attName in enumerate(attitunesList):
+ nodeName = "att_%d" % i
+ data['availableAttitunes'][nodeName] = attName
contentStruct['root']['data'] = data
contentStruct['root']['skin'] = skin
contentStruct['root']['language'] = language
@@ -512,11 +534,17 @@
contentStruct = self.getDefaultContentStruct()
contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
name = parameters['name']
+ reencodedName = name
+ try:
+ tmp = reencodedName.decode("latin-1")
+ reencodedName = tmp.encode("utf-8")
+ except:
+ pass
language = parameters['language']
attitunesContainer = resourceAttituneManager.getAttitunesContainer()
attitunes = attitunesContainer.getAttitunes()
for attitune in attitunes:
- if attitune.getDescription().getName() == name:
+ if attitune.getDescription().getName() in [name, reencodedName]:
attitunePath = attitune.getAttFile()
t = threading.Thread(target = resourcePluginsServer.startPlugin,
args = (
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot 2009-07-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot 2009-07-17 15:59:53 UTC (rev 5124)
@@ -156,3 +156,6 @@
msgid "global_settings"
msgstr ""
+
+msgid "introduction_alerts"
+msgstr ""
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-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-17 15:59:53 UTC (rev 5124)
@@ -156,3 +156,6 @@
msgid "global_settings"
msgstr "Global settings"
+
+msgid "introduction_alerts"
+msgstr "Introduction alerts"
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-17 15:59:53 UTC (rev 5124)
@@ -156,3 +156,6 @@
msgid "global_settings"
msgstr "Configuration globale"
+
+msgid "introduction_alerts"
+msgstr "Introduction des alertes"
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py 2009-07-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py 2009-07-17 15:59:53 UTC (rev 5124)
@@ -69,6 +69,12 @@
# Remove "req_" prefix
for i, e in enumerate(requestData):
requestData[i][0] = e[0].replace("req_", "")
+ # ALERT ATTITUNE section -----------------------------------------------
+ for e in requestData:
+ if e[0].find("alertAttitune") == 0:
+ value = e[1]
+ result["alertAttitune"] = value
+ break
# DESCRIPTION section --------------------------------------------------
# Get gadget description elements
gadgetDescription = {}
@@ -95,6 +101,8 @@
affinedGadgetParameters = {}
i = 0
for parameterName in gadgetParameters.keys():
+ if parameterName.replace(" ", "") == "":
+ continue
parameterData = gadgetParameters[parameterName]
nodeName = "param_%.2d" % i
i += 1
@@ -566,6 +574,8 @@
ugcDataDict = {}
# Creation time
ugcDataDict['creationTime'] = time.time()
+ # Default attitune for alerts introduction
+ ugcDataDict['alertAttitune'] = "----"
# Parent Gadget
ugcDataDict['parentGadget'] = {
'uuid' : gadget.getDescription().getUuid(),
@@ -659,6 +669,11 @@
}
# Creation time
ugcDataDict['creationTime'] = ugc.getUgcFileCreationTime()
+ # Default attitune for alerts introduction
+ if tmpDataDict.has_key("alertAttitune"):
+ ugcDataDict['alertAttitune'] = tmpDataDict['alertAttitune']
+ else:
+ ugcDataDict['alertAttitune'] = "----"
# Description
ugcDataDict['description'] = {
'uuid' : ugcUuid,
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py 2009-07-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py 2009-07-17 15:59:53 UTC (rev 5124)
@@ -36,6 +36,8 @@
self.__parentGadget = parentGadget
# Creation time of the ugc file
self.__ugcFileCreationTime = dictionary['creationTime']
+ # Alert attitune
+ self.__alertAttitune = dictionary['alertAttitune']
# Create descriptor
self.__description = UgcDescription(self, dictionary['description'])
# Create ugc parameters
@@ -84,6 +86,8 @@
@return a dictionary.
"""
data = {}
+ # Alert attitune
+ data['alertAttitune'] = self.__alertAttitune
# Description
description = self.getDescription()
parentDescription = self.getParentGadget().getDescription()
@@ -295,6 +299,15 @@
return self.__ugcFileCreationTime
# --------------------------------------------------------------------------
+ # Get the selected attitune for alerts introduction.
+ # --------------------------------------------------------------------------
+ def getAlertAttitune(self):
+ """Get the selected attitune for alerts introduction.
+ @return: A string.
+ """
+ return self.__alertAttitune
+
+ # --------------------------------------------------------------------------
# Get the parent UGCs container.
# --------------------------------------------------------------------------
def getContainer(self):
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcContainer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcContainer.py 2009-07-17 09:54:43 UTC (rev 5123)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcContainer.py 2009-07-17 15:59:53 UTC (rev 5124)
@@ -212,6 +212,9 @@
f.close()
except:
pass
+ # Add alert attitune if not exists
+ if not ugcDataDict.has_key("alertAttitune"):
+ ugcDataDict["alertAttitune"] = "----"
# Get the parent gadget
if not ugcDataDict.has_key('parentGadget'):
if self.__onUgcDeploymentErrorCallback != None:
|
|
From: remi <c2m...@c2...> - 2009-07-17 09:54:56
|
Author: remi
Date: 2009-07-17 11:54:43 +0200 (Fri, 17 Jul 2009)
New Revision: 5123
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po
software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
Log:
* Updated "On demand" labels to "Favorites"
* Fixed filters order in the "gadgets" page. The first filter is now "Favorites".
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl 2009-07-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadget_configuration.xsl 2009-07-17 09:54:43 UTC (rev 5123)
@@ -113,7 +113,7 @@
<xsl:when test="root/data/description/onDemandIsAble = 'true'">
<!-- BAR -->
<div class="gadgetConfTitleBarOnDemand">
- <span class="gadgetConfTitleBarLabel"><xsl:value-of select="root/translations/on_demand"/></span>
+ <span class="gadgetConfTitleBarLabel"><xsl:value-of select="root/translations/on_demand_config_section"/></span>
</div>
<div class="gadgetConfTitleBarBottom2"></div>
<!-- Content -->
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-07-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-07-17 09:54:43 UTC (rev 5123)
@@ -36,7 +36,7 @@
<script type="text/javascript" src="/data/web_interface/user_01/js/lightbox.js"></script>
<script language="javascript">
<![CDATA[
- var knowedGadgetsFilter = "all_gadgets";
+ var knowedGadgetsFilter = "on_demand";
var knowedGadgetsDict = null;
var knowedPlayingGadgetUuid1 = "0";
var knowedPlayingGadgetUuid2 = "0";
@@ -52,7 +52,7 @@
translationStart = document.getElementById("translationStart").value;
translationStop = document.getElementById("translationStop").value;
translationDelete = document.getElementById("translationDelete").value;
- fillGadgetRows("all_gadgets");
+ fillGadgetRows("on_demand");
updatePlayingGadgetUuid();
}
@@ -533,6 +533,13 @@
<div class="frame01TopSpace">
<div class="gadgetsVSpacer" style="width:35px;height:40px;"></div>
<xsl:element name="a">
+ <xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioEnable</xsl:attribute>
+ <xsl:attribute name="id">gadgetsFilterRadioOnDemand</xsl:attribute>
+ <xsl:attribute name="onclick">javascript:fillGadgetRows('on_demand');return false;</xsl:attribute>
+ <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/on_demand"/>
+ </xsl:element>
+ <div class="gadgetsVSpacer" style="width:5px;height:40px;"></div>
+ <xsl:element name="a">
<xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioActivate</xsl:attribute>
<xsl:attribute name="id">gadgetsFilterRadioAll</xsl:attribute>
<xsl:attribute name="onclick">javascript:fillGadgetRows('all_gadgets'); return false;</xsl:attribute>
@@ -541,13 +548,6 @@
<div class="gadgetsVSpacer" style="width:5px;height:40px;"></div>
<xsl:element name="a">
<xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioEnable</xsl:attribute>
- <xsl:attribute name="id">gadgetsFilterRadioOnDemand</xsl:attribute>
- <xsl:attribute name="onclick">javascript:fillGadgetRows('on_demand');return false;</xsl:attribute>
- <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/on_demand"/>
- </xsl:element>
- <div class="gadgetsVSpacer" style="width:5px;height:40px;"></div>
- <xsl:element name="a">
- <xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioEnable</xsl:attribute>
<xsl:attribute name="id">gadgetsFilterRadioAlerts</xsl:attribute>
<xsl:attribute name="onclick">javascript:fillGadgetRows('alerts');return false;</xsl:attribute>
<xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/alerts"/>
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot 2009-07-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/default.pot 2009-07-17 09:54:43 UTC (rev 5123)
@@ -73,6 +73,9 @@
msgid "my_use_of_the_gadget"
msgstr ""
+msgid "on_demand_config_section"
+msgstr ""
+
msgid "on_demand_description"
msgstr ""
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-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-17 09:54:43 UTC (rev 5123)
@@ -32,7 +32,7 @@
msgstr "All"
msgid "on_demand"
-msgstr "On demand"
+msgstr "Favorites"
msgid "alerts"
msgstr "Alerts"
@@ -73,8 +73,11 @@
msgid "my_use_of_the_gadget"
msgstr "My use of the gadget"
+msgid "on_demand_config_section"
+msgstr "Favorite"
+
msgid "on_demand_description"
-msgstr "This gadget will be accessible with the remote control."
+msgstr "This gadget will be placed in the Favorites list."
msgid "date"
msgstr "Date"
Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-17 09:39:21 UTC (rev 5122)
+++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-17 09:54:43 UTC (rev 5123)
@@ -32,7 +32,7 @@
msgstr "Tous"
msgid "on_demand"
-msgstr "A la demande"
+msgstr "Favoris"
msgid "alerts"
msgstr "Alertes"
@@ -73,8 +73,11 @@
msgid "my_use_of_the_gadget"
msgstr "Mon utilisation du gadget"
+msgid "on_demand_config_section"
+msgstr "Favori"
+
msgid "on_demand_description"
-msgstr "Ce gadget sera accessible avec la télécommande."
+msgstr "Ce gadget sera placé dans la liste des favoris."
msgid "date"
msgstr "Date"
|
|
From: remi <c2m...@c2...> - 2009-07-17 09:39:33
|
Author: remi Date: 2009-07-17 11:39:21 +0200 (Fri, 17 Jul 2009) New Revision: 5122 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/fr.po Log: * Fixed "Full hours" translations fr : Heures, en : Hours. (For the "frequency" combobox) 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-17 09:22:33 UTC (rev 5121) +++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/en.po 2009-07-17 09:39:21 UTC (rev 5122) @@ -128,7 +128,7 @@ msgstr "Half hours" msgid "full_hours" -msgstr "Full hours" +msgstr "Hours" msgid "crazy" msgstr "Crazy" Modified: software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-17 09:22:33 UTC (rev 5121) +++ software_suite_v3/smart-core/smart-server/trunk/translation/wi_user/fr.po 2009-07-17 09:39:21 UTC (rev 5122) @@ -128,7 +128,7 @@ msgstr "Demi-heures" msgid "full_hours" -msgstr "Heures pleines" +msgstr "Heures" msgid "crazy" msgstr "Fou" |
|
From: remi <c2m...@c2...> - 2009-07-17 09:22:43
|
Author: remi
Date: 2009-07-17 11:22:33 +0200 (Fri, 17 Jul 2009)
New Revision: 5121
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl
Log:
* Fixed button "Sound On/Off" behavior in the page "Live with Tux"
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css 2009-07-17 09:19:02 UTC (rev 5120)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/livewithtux.css 2009-07-17 09:22:33 UTC (rev 5121)
@@ -502,64 +502,110 @@
overflow:hidden;
}
-img.statusBtnSoundOn{
- top:0px;
- left:0px;
- width:101px;
+.statusBtnSoundOnEnable{
+ width:71px;
+ _width:101px;
height:32px;
+ padding-left:30px;
+ padding-top:-1px;
margin-left:10px;
margin-top:9px;
display:table;
float:left;
+ line-height:32px;
+ font-size:11px;
+ color:#FFFFFF;
+ text-align:center;
+ vertical-align:middle;
+ font-weight:bold;
+ overflow:hidden;
+ text-decoration:none;
+ font-family:Verdana, Bitstream Vera Sans;
+ background-image:url(/data/web_interface/user_01/img/status_btn_soundon_enable.png);
}
-.statusBtnSoundOnLabel{
- top:0px;
- left:0px;
- width:70px;
+.statusBtnSoundOnEnable:hover{
+ background-image:url(/data/web_interface/user_01/img/status_btn_soundon_activate.png);
+}
+
+.statusBtnSoundOnActivate{
+ width:71px;
+ _width:101px;
height:32px;
- margin-left:-70px;
- margin-top:8px;
+ padding-left:30px;
+ padding-top:-1px;
+ margin-left:10px;
+ margin-top:9px;
display:table;
float:left;
line-height:32px;
font-size:11px;
color:#FFFFFF;
text-align:center;
+ vertical-align:middle;
font-weight:bold;
overflow:hidden;
+ text-decoration:none;
font-family:Verdana, Bitstream Vera Sans;
+ background-image:url(/data/web_interface/user_01/img/status_btn_soundon_activate.png);
}
-img.statusBtnSoundOff{
- top:0px;
- left:0px;
- width:102px;
+.statusBtnSoundOnActivate:hover{
+ background-image:url(/data/web_interface/user_01/img/status_btn_soundon_activate.png);
+}
+
+.statusBtnSoundOffEnable{
+ width:80px;
+ _width:102px;
height:32px;
+ padding-left:22px;
+ padding-top:-1px;
margin-left:0px;
margin-top:9px;
display:table;
float:left;
+ line-height:32px;
+ font-size:11px;
+ color:#FFFFFF;
+ text-align:center;
+ vertical-align:middle;
+ font-weight:bold;
+ overflow:hidden;
+ text-decoration:none;
+ font-family:Verdana, Bitstream Vera Sans;
+ background-image:url(/data/web_interface/user_01/img/status_btn_soundoff_enable.png);
}
-.statusBtnSoundOffLabel{
- top:0px;
- left:0px;
- width:70px;
+.statusBtnSoundOffEnable:hover{
+ background-image:url(/data/web_interface/user_01/img/status_btn_soundoff_activate.png);
+}
+
+.statusBtnSoundOffActivate{
+ width:80px;
+ _width:102px;
height:32px;
- margin-left:-75px;
- margin-top:8px;
+ padding-left:22px;
+ padding-top:-1px;
+ margin-left:0px;
+ margin-top:9px;
display:table;
float:left;
line-height:32px;
font-size:11px;
color:#FFFFFF;
text-align:center;
+ vertical-align:middle;
font-weight:bold;
overflow:hidden;
+ text-decoration:none;
font-family:Verdana, Bitstream Vera Sans;
+ background-image:url(/data/web_interface/user_01/img/status_btn_soundoff_activate.png);
}
+.statusBtnSoundOffActivate:hover{
+ background-image:url(/data/web_interface/user_01/img/status_btn_soundoff_activate.png);
+}
+
.leightbox {
color: #333;
display: none;
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl 2009-07-17 09:19:02 UTC (rev 5120)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/livewithtux.xsl 2009-07-17 09:22:33 UTC (rev 5121)
@@ -196,8 +196,8 @@
function showSoundOn()
{
- document.getElementById("statusBtnSoundOn").src = "/data/web_interface/user_01/img/status_btn_soundon_activate.png";
- document.getElementById("statusBtnSoundOff").src = "/data/web_interface/user_01/img/status_btn_soundoff_enable.png";
+ document.getElementById("statusBtnSoundOn").className = "statusBtnSoundOnActivate";
+ document.getElementById("statusBtnSoundOff").className = "statusBtnSoundOffEnable";
}
function setSoundOn()
@@ -207,8 +207,8 @@
function showSoundOff()
{
- document.getElementById("statusBtnSoundOn").src = "/data/web_interface/user_01/img/status_btn_soundon_enable.png";
- document.getElementById("statusBtnSoundOff").src = "/data/web_interface/user_01/img/status_btn_soundoff_activate.png";
+ document.getElementById("statusBtnSoundOn").className = "statusBtnSoundOnEnable";
+ document.getElementById("statusBtnSoundOff").className = "statusBtnSoundOffActivate";
}
function setSoundOff()
@@ -592,21 +592,19 @@
<xsl:attribute name="src">/data/web_interface/user_01/img/status_battery_nodongle.png</xsl:attribute>
</xsl:element>
<!-- STATUS BTN SOUND ON -->
- <xsl:element name="img">
- <xsl:attribute name="class">statusBtnSoundOn</xsl:attribute>
+ <xsl:element name="a">
+ <xsl:attribute name="class">statusBtnSoundOnEnable</xsl:attribute>
<xsl:attribute name="id">statusBtnSoundOn</xsl:attribute>
<xsl:attribute name="onclick">javascript:setSoundOn();return false;</xsl:attribute>
- <xsl:attribute name="src">/data/web_interface/user_01/img/status_btn_soundon_enable.png</xsl:attribute>
+ <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/sound_on"/>
</xsl:element>
- <span class="statusBtnSoundOnLabel"><xsl:value-of select="root/translations/sound_on"/></span>
<!-- STATUS BTN SOUND OFF -->
- <xsl:element name="img">
- <xsl:attribute name="class">statusBtnSoundOff</xsl:attribute>
+ <xsl:element name="a">
+ <xsl:attribute name="class">statusBtnSoundOffActivate</xsl:attribute>
<xsl:attribute name="id">statusBtnSoundOff</xsl:attribute>
<xsl:attribute name="onclick">javascript:setSoundOff();return false;</xsl:attribute>
- <xsl:attribute name="src">/data/web_interface/user_01/img/status_btn_soundoff_activate.png</xsl:attribute>
+ <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/sound_off"/>
</xsl:element>
- <span class="statusBtnSoundOffLabel"><xsl:value-of select="root/translations/sound_off"/></span>
</div>
</div>
<!-- EXAMPLE OF LIGHTBOX -->
|
|
From: remi <c2m...@c2...> - 2009-07-17 09:19:14
|
Author: remi
Date: 2009-07-17 11:19:02 +0200 (Fri, 17 Jul 2009)
New Revision: 5120
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetDescription.py
Log:
* Fixed name of translated help wiki pages
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetDescription.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetDescription.py 2009-07-17 09:13:31 UTC (rev 5119)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetDescription.py 2009-07-17 09:19:02 UTC (rev 5120)
@@ -211,7 +211,7 @@
return os.path.join(self.__workingPath, "help.wiki")
else:
helpFile = os.path.join(self.__workingPath,
- "help_%s.wiki" % language)
+ "%s.wiki" % language)
if not os.path.isfile(helpFile):
return os.path.join(self.__workingPath, "help.wiki")
else:
|
|
From: remi <c2m...@c2...> - 2009-07-17 09:13:52
|
Author: remi
Date: 2009-07-17 11:13:31 +0200 (Fri, 17 Jul 2009)
New Revision: 5119
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py
Log:
* Don't save the default value of parameter "locutor" on gadget create/duplicate.
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py 2009-07-15 12:40:06 UTC (rev 5118)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetGenerator.py 2009-07-17 09:13:31 UTC (rev 5119)
@@ -393,6 +393,12 @@
gadgetInfoDict, iconFileName, helpFileContent = GadgetGenerator.pluginToGadgetRequestDataToDict(requestData, plugin)
# Complete info dict to create a gadget.xml
gadgetInfoDict['description']['uuid'] = gadgetUuid
+ # Remove language parameter
+ if gadgetInfoDict.has_key("parameters"):
+ for key in gadgetInfoDict['parameters'].keys():
+ if gadgetInfoDict['parameters'][key]['name'] == 'locutor':
+ gadgetInfoDict['parameters'][key]["defaultValue"] = ''
+ break
gadgetXmlDict = {
'gadget' : gadgetInfoDict
}
@@ -459,6 +465,12 @@
gadgetInfoDict['description']['uuid'] = gadgetUuid
gadgetInfoDict['description']['name'] = gadgetName
gadgetInfoDict['description']['ttsName'] = gadgetName
+ # Remove language parameter
+ if gadgetInfoDict.has_key("parameters"):
+ for key in gadgetInfoDict['parameters'].keys():
+ if gadgetInfoDict['parameters'][key]['name'] == 'locutor':
+ gadgetInfoDict['parameters'][key]["defaultValue"] = ''
+ break
gadgetXmlDict = {
'gadget' : gadgetInfoDict
}
|
|
From: remi <c2m...@c2...> - 2009-07-15 12:40:16
|
Author: remi
Date: 2009-07-15 14:40:06 +0200 (Wed, 15 Jul 2009)
New Revision: 5118
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-b6
Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-15 12:35:32 UTC (rev 5117)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-15 12:40:06 UTC (rev 5118)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.1-b5"
+!define PRODUCT_VERSION "0.4.1-b6"
; 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-15 12:35:32 UTC (rev 5117)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py 2009-07-15 12:40:06 UTC (rev 5118)
@@ -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-b5'
+version = '0.4.1-b6'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
|
From: remi <c2m...@c2...> - 2009-07-15 12:35:45
|
Author: remi
Date: 2009-07-15 14:35:32 +0200 (Wed, 15 Jul 2009)
New Revision: 5117
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py
Log:
* Added function to kill previous children instances on Linux.
Modified: software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py 2009-07-15 12:10:59 UTC (rev 5116)
+++ software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py 2009-07-15 12:35:32 UTC (rev 5117)
@@ -122,7 +122,25 @@
def __killOldSmartCoreChildrenUnix():
"""Kill all process alive from a previous instance of smart-core. Unix.
"""
- pass
+ processInfosList = __getProcessIdNameCmdLineListUnix()
+ pidToKill = []
+ for e in processInfosList:
+ pid = e[0]
+ name = e[1]
+ cmdline = e[2]
+ if name.lower().find("python") != -1:
+ if cmdline.lower().find("executables") != -1:
+ pidToKill.append(pid)
+ continue
+ if cmdline.lower().find("workforplugins") != -1:
+ pidToKill.append(pid)
+ continue
+ if (cmdline.lower().find("tuxdroid") != -1) and \
+ (cmdline.lower().find("util") != -1):
+ pidToKill.append(pid)
+ continue
+ for pid in pidToKill:
+ os.system("kill -9 " + str(pid))
# ------------------------------------------------------------------------------
# Kill previous smart-server. Unix.
|
|
From: remi <c2m...@c2...> - 2009-07-15 12:11:18
|
Author: remi
Date: 2009-07-15 14:10:59 +0200 (Wed, 15 Jul 2009)
New Revision: 5116
Modified:
software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py
Log:
* Updated stop server method
Modified: software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py 2009-07-15 11:51:57 UTC (rev 5115)
+++ software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py 2009-07-15 12:10:59 UTC (rev 5116)
@@ -15,6 +15,7 @@
import sys
import os
import getopt
+import time
from util.smartcore.OldProcessKiller import killOldSmartCoreChildren
from util.smartcore.OldProcessKiller import killPreviousSmartServer
@@ -26,18 +27,23 @@
return URLTestRequestGet("127.0.0.1", TDS_HTTP_PORT, "/", 200, 5.0)
def killServer():
- killOldSmartCoreChildren()
+ # Stop the server regularly
URLTestRequestGet("127.0.0.1", TDS_HTTP_PORT, "/server/stop?", 200, 0.5)
URLTestRequestGet("127.0.0.1", TDS_HTTP_PORT, "/server/stop?", 200, 0.5)
+ # Wait 5 secs max that the previous server has been stopped
+ for i in range(10):
+ if not checkServerRun():
+ break
+ time.sleep(0.5)
+ # Kill smart-core tasks if still alive
+ killOldSmartCoreChildren()
killPreviousSmartServer()
+ # Refresh taskbar icons
refreshTaskBar()
def killServerAndWait():
- import time
killServer()
time.sleep(0.5)
- while checkServerRun():
- time.sleep(0.5)
def runServer():
killOldSmartCoreChildren()
|
|
From: remi <c2m...@c2...> - 2009-07-15 11:52:02
|
Author: remi
Date: 2009-07-15 13:51:57 +0200 (Wed, 15 Jul 2009)
New Revision: 5115
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py
Log:
* Added function to kill previous smart-server instances on Linux.
Modified: software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py 2009-07-15 11:16:31 UTC (rev 5114)
+++ software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py 2009-07-15 11:51:57 UTC (rev 5115)
@@ -130,7 +130,19 @@
def __killPreviousSmartServerUnix():
"""Kill previous smart-server. Unix.
"""
- pass
+ processInfosList = __getProcessIdNameCmdLineListUnix()
+ pidToKill = []
+ for e in processInfosList:
+ pid = e[0]
+ name = e[1]
+ cmdline = e[2]
+ if name.lower().find("python") != -1:
+ if cmdline.lower().find("tuxhttpserver") != -1:
+ if cmdline.lower().find("start") != -1:
+ if pid != os.getpid():
+ pidToKill.append(pid)
+ for pid in pidToKill:
+ os.system("kill -3 -15 -9 " + str(pid))
# ------------------------------------------------------------------------------
# Kill all process alive from a previous instance of smart-core.
|
|
From: remi <c2m...@c2...> - 2009-07-15 11:16:45
|
Author: remi Date: 2009-07-15 13:16:31 +0200 (Wed, 15 Jul 2009) New Revision: 5114 Modified: software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py Log: * Added a function to retrieve a list of process id/name/cmdline on linux Modified: software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py 2009-07-14 17:53:58 UTC (rev 5113) +++ software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py 2009-07-15 11:16:31 UTC (rev 5114) @@ -4,8 +4,58 @@ # http://www.gnu.org/copyleft/gpl.html import os +import sys # ------------------------------------------------------------------------------ +# Create a process list as pid, name, command line. Unix. +# ------------------------------------------------------------------------------ +def __getProcessIdNameCmdLineListUnix(): + """Create a process list as pid, name, command line. Unix. + """ + def getPidList(): + pidList = [] + for pidDir in os.listdir("/proc/"): + try: + pid = int(pidDir) + except: + continue + pidList.append(pid) + return pidList + + def getProcessCmdLine(pid): + fileName = "/proc/%d/cmdline" % pid + if not os.path.isfile(fileName): + return "" + else: + try: + f = open(fileName, "r") + result = f.read().replace("\x00", " ") + f.close() + except: + return "" + return result + + def getProcessName(pid): + fileName = "/proc/%d/status" % pid + if not os.path.isfile(fileName): + return "" + else: + try: + f = open(fileName, "r") + result = f.readline()[6:-1] + f.close() + except: + return "" + return result + + result = [] + pidList = getPidList() + for pid in pidList: + e = [pid, getProcessName(pid), getProcessCmdLine(pid)] + result.append(e) + return result + +# ------------------------------------------------------------------------------ # Kill all process alive from a previous instance of smart-core. Window. # ------------------------------------------------------------------------------ def __killOldSmartCoreChildrenWin32(): @@ -38,7 +88,7 @@ win32api.CloseHandle(handle) except: pass - + # ------------------------------------------------------------------------------ # Kill previous smart-server. Window. # ------------------------------------------------------------------------------ @@ -73,7 +123,7 @@ """Kill all process alive from a previous instance of smart-core. Unix. """ pass - + # ------------------------------------------------------------------------------ # Kill previous smart-server. Unix. # ------------------------------------------------------------------------------ @@ -92,7 +142,7 @@ __killOldSmartCoreChildrenWin32() else: __killOldSmartCoreChildrenUnix() - + # ------------------------------------------------------------------------------ # Kill previous smart-server. # ------------------------------------------------------------------------------ |
|
From: remi <c2m...@c2...> - 2009-07-14 17:54:10
|
Author: remi
Date: 2009-07-14 19:53:58 +0200 (Tue, 14 Jul 2009)
New Revision: 5113
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py
Log:
* Fixed taskbar icons refreshing function. (Tested on xp en, vista en and vista fr)
Modified: software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py 2009-07-14 10:24:22 UTC (rev 5112)
+++ software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py 2009-07-14 17:53:58 UTC (rev 5113)
@@ -21,7 +21,7 @@
FW(FW(FW(0, "Shell_TrayWnd"), "TrayNotifyWnd"), "SysPager"),
0,
"ToolbarWindow32",
- "Notification Area")
+ None)
# Get TaskBar area
rect = win32gui.GetClientRect(hWnd)
width = rect[2]
@@ -51,11 +51,11 @@
def refreshTaskBar():
"""Refresh the task bar.
"""
- return
- '''
- if os.name == "nt":
- __refreshTaskBarWin32()
- else:
- __refreshTaskBarUnix()
- '''
+ try:
+ if os.name == "nt":
+ __refreshTaskBarWin32()
+ else:
+ __refreshTaskBarUnix()
+ except:
+ pass
|
|
From: ks156 <c2m...@c2...> - 2009-07-14 10:24:46
|
Author: ks156
Date: 2009-07-14 12:24:22 +0200 (Tue, 14 Jul 2009)
New Revision: 5112
Modified:
software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/control/controlTux.java
Log:
* Removed the remote control binding to not create conflicts with the GUI.
Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/control/controlTux.java
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/control/controlTux.java 2009-07-14 09:54:28 UTC (rev 5111)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/control/controlTux.java 2009-07-14 10:24:22 UTC (rev 5112)
@@ -103,8 +103,6 @@
"onBatteryLevelEvent");
tux.tts.registerEventOnVoiceList(this,
"onVoiceListChanged");
- tux.event.handler.register(TuxAPIConst.ST_NAME_REMOTE_BUTTON, this,
- "onRemoteControl");
/* End of the movements */
tux.event.handler.register(TuxAPIConst.ST_NAME_EYES_RM, this,
|
|
From: remi <c2m...@c2...> - 2009-07-14 09:54:44
|
Author: remi
Date: 2009-07-14 11:54:28 +0200 (Tue, 14 Jul 2009)
New Revision: 5111
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-b5
Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-14 09:43:55 UTC (rev 5110)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-14 09:54:28 UTC (rev 5111)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.1-b4"
+!define PRODUCT_VERSION "0.4.1-b5"
; 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-14 09:43:55 UTC (rev 5110)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py 2009-07-14 09:54:28 UTC (rev 5111)
@@ -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-b4'
+version = '0.4.1-b5'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
|
From: remi <c2m...@c2...> - 2009-07-14 09:43:57
|
Author: remi Date: 2009-07-14 11:43:55 +0200 (Tue, 14 Jul 2009) New Revision: 5110 Modified: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.exe Log: * Fixed TuxBox Webbrowser executable to avoid the Windows shutdown canceling. (When you cancel the FormCloseQuery event, you need to react to the WM_QUERYENDSESSION Windows messages, otherwise, all Windows shutdown will be canceled) Modified: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.exe =================================================================== (Binary files differ) |
|
From: remi <c2m...@c2...> - 2009-07-14 09:10:35
|
Author: remi
Date: 2009-07-14 11:10:22 +0200 (Tue, 14 Jul 2009)
New Revision: 5109
Modified:
software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
* Now uses the new functions from the module "Device"
Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py 2009-07-14 09:09:09 UTC (rev 5108)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py 2009-07-14 09:10:22 UTC (rev 5109)
@@ -24,6 +24,7 @@
from util.SimplePlugin.SimplePluginConfiguration import SimplePluginConfiguration
from util.SimplePlugin.SimplePlugin import SimplePlugin
from util.system.TaskBar import refreshTaskBar
+from util.system.Device import *
class Configuration(SimplePluginConfiguration):
"""This class make an access to the plugin parameters.
@@ -192,15 +193,13 @@
"""Set tux as audio peripheral.
"""
if os.name == "nt":
- import platform
- if int(platform.version().split(".")[0]) >= 6:
- self.__sendCommandToSkype('SET AUDIO_IN TuxDroid-Micro (TuxDroid-Audio)')
- self.__sendCommandToSkype('SET AUDIO_OUT Speakers (TuxDroid-Audio)')
- self.__sendCommandToSkype('SET RINGER Speakers (TuxDroid-Audio)')
- else:
- self.__sendCommandToSkype('SET AUDIO_IN TuxDroid-Audio')
- self.__sendCommandToSkype('SET AUDIO_OUT TuxDroid-Audio')
- self.__sendCommandToSkype('SET RINGER TuxDroid-Audio')
+ audioIn = Device.getSoundDeviceNameTuxdroidMicro()
+ audioOut = Device.getSoundDeviceNameTuxdroidAudio()
+ if audioOut == None:
+ return
+ self.__sendCommandToSkype('SET AUDIO_IN %s' % audioIn)
+ self.__sendCommandToSkype('SET AUDIO_OUT %s' % audioOut)
+ self.__sendCommandToSkype('SET RINGER %s' % audioOut)
else:
self.__sendCommandToSkype('SET AUDIO_IN TuxDroid (plughw:TuxDroid,0)')
self.__sendCommandToSkype('SET AUDIO_OUT TuxDroid (plughw:TuxDroid,0)')
|
|
From: remi <c2m...@c2...> - 2009-07-14 09:09:20
|
Author: remi
Date: 2009-07-14 11:09:09 +0200 (Tue, 14 Jul 2009)
New Revision: 5108
Modified:
software_suite_v3/smart-core/smart-server/trunk/TDSConfiguration.py
Log:
* Users and resources configurations are now located in the default installation path on linux (typically /usr/share/tuxdroid/...)
Modified: software_suite_v3/smart-core/smart-server/trunk/TDSConfiguration.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/TDSConfiguration.py 2009-07-14 08:55:56 UTC (rev 5107)
+++ software_suite_v3/smart-core/smart-server/trunk/TDSConfiguration.py 2009-07-14 09:09:09 UTC (rev 5108)
@@ -86,12 +86,12 @@
if os.name == 'nt':
TDS_RESOURCES_CONF_PATH = os.path.join(ALLUSERSBASEDIR, "configurations", "resources")
else:
- TDS_RESOURCES_CONF_PATH = os.path.join("/etc/tuxdroid", "resources_conf")
+ TDS_RESOURCES_CONF_PATH = os.path.join(TUXDROID_BASE_PATH, "resources_conf")
# Path of the user configurations
if os.name == 'nt':
TDS_USERS_CONF_PATH = os.path.join(ALLUSERSBASEDIR, "configurations", "users_conf")
else:
- TDS_USERS_CONF_PATH = os.path.join("/etc/tuxdroid", "users_conf")
+ TDS_USERS_CONF_PATH = os.path.join(TUXDROID_BASE_PATH, "users_conf")
# Path of the default content of the server
if os.name == 'nt':
TDS_DEFAULT_CONTENT_PATH = os.path.join(ALLUSERSBASEDIR, "resources")
|
|
From: remi <c2m...@c2...> - 2009-07-14 08:56:12
|
Author: remi
Date: 2009-07-14 10:55:56 +0200 (Tue, 14 Jul 2009)
New Revision: 5107
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/system/Device.py
Log:
* Added functions to retrieve the Tuxdroid sound card names. (independent to the Windows version/language)
Modified: software_suite_v3/smart-core/smart-server/trunk/util/system/Device.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/system/Device.py 2009-07-13 14:01:31 UTC (rev 5106)
+++ software_suite_v3/smart-core/smart-server/trunk/util/system/Device.py 2009-07-14 08:55:56 UTC (rev 5107)
@@ -13,32 +13,99 @@
"""
# --------------------------------------------------------------------------
- # Get the sound device of Tux Droid.
+ # Get a sound device by a keyword. Win32.
# --------------------------------------------------------------------------
- def getTuxDroidSoundDevice():
- """Get the sound device of Tux Droid.
- @return: A string.
+ def getSoundDeviceByKeywordWin32(deviceKeyword):
+ """Get a sound device by a keyword.
+ @param deviceKeyword: Device keyword.
+ @return: A tuple (device index, device name)
"""
- if os.name == 'nt':
- import platform
- if int(platform.version().split(".")[0]) >= 6:
- deviceName = "Speakers (TuxDroid-Audio)"
- else:
- deviceName = "TuxDroid-Audio"
+ from ctypes import windll
+ winmm = windll.winmm
+ wvcps = ' ' * 52
+ cardsCount = winmm.waveOutGetNumDevs()
+ firstDevice = ""
+ for i in range(cardsCount):
+ try:
+ if winmm.waveOutGetDevCapsA(i, wvcps,len(wvcps)) == 0:
+ deviceName = wvcps[8:].split("\0")[0]
+ if i == 0:
+ firstDevice = deviceName
+ if wvcps.lower().find(deviceKeyword.lower()) != -1:
+ return i, deviceName
+ except:
+ pass
+ return -1, None
+
+ # --------------------------------------------------------------------------
+ # Get the sound device name of Tux Droid Audio.
+ # --------------------------------------------------------------------------
+ def getSoundDeviceNameTuxdroidAudio():
+ """Get the sound device name of Tux Droid Audio.
+ @return: The device name or None (Win32) if not found.
+ """
+ if os.name == "nt":
+ idx, deviceName = Device.getSoundDeviceByKeywordWin32("tuxdroid-audio")
+ return deviceName
+ else:
+ return "plughw:TuxDroid,0"
+
+ # --------------------------------------------------------------------------
+ # Get the sound device name of Tux Droid TTS.
+ # --------------------------------------------------------------------------
+ def getSoundDeviceNameTuxdroidTts():
+ """Get the sound device name of Tux Droid Tts.
+ @return: The device name or None (Win32) if not found.
+ """
+ if os.name == "nt":
+ idx, deviceName = Device.getSoundDeviceByKeywordWin32("tuxdroid-tts")
+ return deviceName
+ else:
+ return "plughw:TuxDroid,1"
+
+ # --------------------------------------------------------------------------
+ # Get the sound device name of Tux Droid Micro.
+ # --------------------------------------------------------------------------
+ def getSoundDeviceNameTuxdroidMicro():
+ """Get the sound device name of Tux Droid Micro.
+ @return: The device name or None (Win32) if not found.
+ """
+ if os.name == "nt":
from ctypes import windll
winmm = windll.winmm
wvcps = ' ' * 52
- cardsCount = winmm.waveOutGetNumDevs()
+ cardsCount = winmm.waveInGetNumDevs()
for i in range(cardsCount):
try:
- if winmm.waveOutGetDevCapsA(i, wvcps,len(wvcps)) == 0:
- if wvcps[8:].split("\0")[0].find(deviceName) == 0:
- idx = i + 1
- return "dsound:device=%d" % idx
+ if winmm.waveInGetDevCapsA(i, wvcps,len(wvcps)) == 0:
+ deviceName = wvcps[8:].split("\0")[0]
+ if wvcps.lower().find("tuxdroid-audio") != -1:
+ return deviceName
except:
pass
- return "dsound:device=1"
+ return None
else:
+ return "plughw:TuxDroid,0"
+
+ # --------------------------------------------------------------------------
+ # Get the sound device of Tux Droid.
+ # --------------------------------------------------------------------------
+ def getTuxDroidSoundDevice():
+ """Get the sound device of Tux Droid.
+ @return: A string.
+ """
+ if os.name == 'nt':
+ idx, deviceName = Device.getSoundDeviceByKeywordWin32("tuxdroid-audio")
+ if idx == -1:
+ return "dsound:device=1"
+ else:
+ idx += 1
+ return "dsound:device=%d" % idx
+ else:
return "alsa:device=plughw=TuxDroid,0"
+ getSoundDeviceByKeywordWin32 = staticmethod(getSoundDeviceByKeywordWin32)
+ getSoundDeviceNameTuxdroidAudio = staticmethod(getSoundDeviceNameTuxdroidAudio)
+ getSoundDeviceNameTuxdroidTts = staticmethod(getSoundDeviceNameTuxdroidTts)
+ getSoundDeviceNameTuxdroidMicro = staticmethod(getSoundDeviceNameTuxdroidMicro)
getTuxDroidSoundDevice = staticmethod(getTuxDroidSoundDevice)
|
|
From: remi <c2m...@c2...> - 2009-07-13 14:01:35
|
Author: remi
Date: 2009-07-13 16:01:31 +0200 (Mon, 13 Jul 2009)
New Revision: 5106
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-b4
Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-13 13:59:47 UTC (rev 5105)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi 2009-07-13 14:01:31 UTC (rev 5106)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.1-b3"
+!define PRODUCT_VERSION "0.4.1-b4"
; 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-13 13:59:47 UTC (rev 5105)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py 2009-07-13 14:01:31 UTC (rev 5106)
@@ -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-b3'
+version = '0.4.1-b4'
author = "Remi Jocaille (rem...@c2...)"
licence = "GPL"
date = "2009"
|
1 message has been excluded from this view by a project administrator.
