tux-droid-svn Mailing List for Tux Droid CE

Status: Beta

Brought to you by: ks156

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

Flat | Threaded

1 2 3 .. 237 > >> (Page 1 of 237)

[tuxdroid-svn] r6105 - software_suite_v3/smart-core/smart-server/branches

From: remi <c2m...@c2...> - 2010-06-04 09:51:51

Author: remi
Date: 2010-06-04 11:33:02 +0200 (Fri, 04 Jun 2010)
New Revision: 6105

Added:
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/
Log:
* Added a branches to prepare demo for DiYSE consortium meeting (June 2010)

[tuxdroid-svn] r6106 - in software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01: css xsl

From: remi <c2m...@c2...> - 2010-06-04 09:51:51

Author: remi
Date: 2010-06-04 11:36:25 +0200 (Fri, 04 Jun 2010)
New Revision: 6106

Modified:
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/attitunes.css
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/gadgets.css
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/livewithtux.css
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/online.css
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/tools.css
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/attitunes.xsl
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/gadgets.xsl
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/livewithtux.xsl
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/online.xsl
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/tools.xsl
Log:
* Fixed css and xsl files to be compatible with safari >=3 browser.

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/attitunes.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/attitunes.css	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/attitunes.css	2010-06-04 09:36:25 UTC (rev 6106)
@@ -47,20 +47,13 @@
 }
 
 div.frame01Sep2{
-    font-family:Verdana, Bitstream Vera Sans;
-    display:table;
-    background-image:url(/data/web_interface/user_01/img/frame_01_sep_2.png);
-    background-repeat:repeat;
-    height:2px;
-    width:845px;
-    overflow: hidden;
-}
-
-div.frame01Sep2{
     margin-top:2px;
+    margin-bottom:-15px;
+    _margin-bottom:0px;
     display:table;
+    float:left;
     background-image:url(/data/web_interface/user_01/img/frame_01_sep_2.png);
-    background-repeat:repeat;
+    background-repeat:no-repeat;
     height:2px;
     width:845px;
     overflow: hidden;
@@ -128,8 +121,6 @@
 }
 
 .attitunesBtnTitle{
-    width:56px;
-    _width:72px;
     height:34px;
     padding-left:16px;
     padding-top:-1px;
@@ -147,6 +138,15 @@
     text-decoration:none;
     font-family:Verdana, Bitstream Vera Sans;
 }
+.attitunesBtnTitle{
+    width:56px;
+    _width:72px;
+}
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .attitunesBtnTitle{
+        width:72px;
+    }
+}
 
 .attitunesBtnNoTitle{
     width:32px;
@@ -164,6 +164,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_enable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .attitunesBtnStartEnable{
+        width:72px;
+    }
+}
 
 .attitunesBtnStartEnable:hover{
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_activate.png);
@@ -175,6 +180,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_activate.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .attitunesBtnStartActivate{
+        width:72px;
+    }
+}
 
 .attitunesBtnStartDisable{
     width:59px;
@@ -182,6 +192,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_disable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .attitunesBtnStartDisable{
+        width:72px;
+    }
+}
 
 .attitunesBtnStopEnable{
     width:53px;
@@ -189,6 +204,11 @@
     padding-left:19px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_stop_enable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .attitunesBtnStopEnable{
+        width:72px;
+    }
+}
 
 .attitunesBtnStopEnable:hover{
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_stop_activate.png);
@@ -200,6 +220,11 @@
     padding-left:19px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_stop_activate.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .attitunesBtnStopActivate{
+        width:72px;
+    }
+}
 
 .attitunesBtnStopDisable{
     width:53px;
@@ -207,6 +232,11 @@
     padding-left:19px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_stop_disable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .attitunesBtnStopDisable{
+        width:72px;
+    }
+}
 
 .attitunesBtnEdit{
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_edit_enable.png);

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/gadgets.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/gadgets.css	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/gadgets.css	2010-06-04 09:36:25 UTC (rev 6106)
@@ -47,20 +47,13 @@
 }
 
 div.frame01Sep2{
-    font-family:Verdana, Bitstream Vera Sans;
-    display:table;
-    background-image:url(/data/web_interface/user_01/img/frame_01_sep_2.png);
-    background-repeat:repeat;
-    height:2px;
-    width:845px;
-    overflow: hidden;
-}
-
-div.frame01Sep2{
     margin-top:2px;
+    margin-bottom:-15px;
+    _margin-bottom:0px;
     display:table;
+    float:left;
     background-image:url(/data/web_interface/user_01/img/frame_01_sep_2.png);
-    background-repeat:repeat;
+    background-repeat:no-repeat;
     height:2px;
     width:845px;
     overflow: hidden;
@@ -190,6 +183,11 @@
     text-decoration:none;
     font-family:Verdana, Bitstream Vera Sans;
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .gadgetsBtnTitle{
+        width:72px;
+    }
+}
 
 .gadgetsBtnNoTitle{
     width:32px;
@@ -207,6 +205,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_enable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .gadgetsBtnStartEnable{
+        width:72px;
+    }
+}
 
 .gadgetsBtnStartEnable:hover{
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_activate.png);
@@ -218,6 +221,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_activate.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .gadgetsBtnStartActivate{
+        width:72px;
+    }
+}
 
 .gadgetsBtnStartDisable{
     width:59px;
@@ -225,6 +233,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_disable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .gadgetsBtnStartDisable{
+        width:72px;
+    }
+}
 
 .gadgetsBtnStopEnable{
     width:53px;
@@ -232,6 +245,11 @@
     padding-left:19px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_stop_enable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .gadgetsBtnStopEnable{
+        width:72px;
+    }
+}
 
 .gadgetsBtnStopEnable:hover{
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_stop_activate.png);
@@ -243,6 +261,11 @@
     padding-left:19px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_stop_activate.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .gadgetsBtnStopActivate{
+        width:72px;
+    }
+}
 
 .gadgetsBtnStopDisable{
     width:53px;
@@ -250,6 +273,11 @@
     padding-left:19px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_stop_disable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .gadgetsBtnStopDisable{
+        width:72px;
+    }
+}
 
 .gadgetsBtnHelp{
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_help_enable.png);

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/livewithtux.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/livewithtux.css	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/livewithtux.css	2010-06-04 09:36:25 UTC (rev 6106)
@@ -254,6 +254,7 @@
     display:table;
     line-height:32px;
     float:left;
+    font-size:0px;
     background-image:url(/data/web_interface/user_01/img/thumbnailbar_btn_previous_enable.png);
 }
 
@@ -271,6 +272,7 @@
     display:table;
     line-height:32px;
     float:left;
+    font-size:0px;
     background-image:url(/data/web_interface/user_01/img/thumbnailbar_btn_next_enable.png);
 }
 
@@ -360,6 +362,7 @@
     margin-top:0px;
     _margin-top:5px;
     display:table;
+    float:left;
     line-height:11px;
     font-size:10px;
     color:#FFFFFF;
@@ -390,6 +393,12 @@
 	text-align:left;
     font-family:Verdana, Bitstream Vera Sans;
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    div.notifyHintGadgetMessages{
+        display:table;
+        float:left;
+    }
+}
 
 div.notifyHintAlert{
     position:absolute;
@@ -510,8 +519,6 @@
 }
 
 .statusBtnSoundOnEnable{
-    width:71px;
-    _width:101px;
     height:32px;
     padding-left:30px;
     padding-top:-1px;
@@ -530,14 +537,22 @@
     font-family:Verdana, Bitstream Vera Sans;
     background-image:url(/data/web_interface/user_01/img/status_btn_soundon_enable.png);
 }
+.statusBtnSoundOnEnable{
+    width:71px;
+    _width:101px;
+}
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .statusBtnSoundOnEnable{
+        width:101px;
+    }
+}
 
 .statusBtnSoundOnEnable:hover{
     background-image:url(/data/web_interface/user_01/img/status_btn_soundon_activate.png);
 }
 
 .statusBtnSoundOnActivate{
-    width:71px;
-    _width:101px;
+    background-image:url(/data/web_interface/user_01/img/status_btn_soundon_activate.png);
     height:32px;
     padding-left:30px;
     padding-top:-1px;
@@ -554,16 +569,22 @@
     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);
 }
+.statusBtnSoundOnActivate{
+    width:71px;
+    _width:101px;
+}
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .statusBtnSoundOnActivate{
+        width:101px;
+    }
+}
 
 .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;
@@ -582,14 +603,22 @@
     font-family:Verdana, Bitstream Vera Sans;
     background-image:url(/data/web_interface/user_01/img/status_btn_soundoff_enable.png);
 }
+.statusBtnSoundOffEnable{
+    width:80px;
+    _width:102px;
+}
 
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .statusBtnSoundOffEnable{
+        width:102px;
+    }
+}
+
 .statusBtnSoundOffEnable:hover{
     background-image:url(/data/web_interface/user_01/img/status_btn_soundoff_activate.png);
 }
 
 .statusBtnSoundOffActivate{
-    width:80px;
-    _width:102px;
     height:32px;
     padding-left:22px;
     padding-top:-1px;
@@ -609,6 +638,17 @@
     background-image:url(/data/web_interface/user_01/img/status_btn_soundoff_activate.png);
 }
 
+.statusBtnSoundOffActivate{
+    width:80px;
+    _width:102px;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .statusBtnSoundOffActivate{
+        width:102px;
+    }
+}
+
 .statusBtnSoundOffActivate:hover{
     background-image:url(/data/web_interface/user_01/img/status_btn_soundoff_activate.png);
 }

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/online.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/online.css	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/online.css	2010-06-04 09:36:25 UTC (rev 6106)
@@ -64,6 +64,11 @@
     text-decoration:none;
     font-family:Verdana, Bitstream Vera Sans;
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnTitle{
+        width:72px;
+    }
+}
 
 .toolsBtnStartEnable{
     width:59px;
@@ -71,6 +76,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_enable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnStartEnable{
+        width:72px;
+    }
+}
 
 .toolsBtnStartEnable:hover{
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_activate.png);
@@ -82,6 +92,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_activate.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnStartActivate{
+        width:72px;
+    }
+}
 
 .toolsBtnStartDisable{
     width:59px;
@@ -89,6 +104,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_disable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnStartDisable{
+        width:72px;
+    }
+}
 
 .leightbox {
 	color: #333;

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/tools.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/tools.css	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/css/tools.css	2010-06-04 09:36:25 UTC (rev 6106)
@@ -27,11 +27,13 @@
 
 div.frame01Sep{
     margin-top:6px;
-    margin-bottom:6px;
+    margin-bottom:-12px;
+    _margin-bottom:6px;
     font-family:Verdana, Bitstream Vera Sans;
     display:table;
+    float:left;
     background-image:url(/data/web_interface/user_01/img/frame_01_sep_3.png);
-    background-repeat:repeat;
+    background-repeat:no-repeat;
     height:2px;
     width:855px;
     overflow: hidden;
@@ -67,6 +69,11 @@
     text-decoration:none;
     font-family:Verdana, Bitstream Vera Sans;
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnTitle{
+        width:72px;
+    }
+}
 
 .toolsBtnStartEnable{
     margin-left:10px;
@@ -75,6 +82,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_enable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnStartEnable{
+        width:72px;
+    }
+}
 
 .toolsBtnStartEnable:hover{
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_activate.png);
@@ -86,6 +98,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_activate.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnStartActivate{
+        width:72px;
+    }
+}
 
 .toolsBtnStartDisable{
     width:59px;
@@ -93,6 +110,11 @@
     padding-left:13px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_play_disable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnStartDisable{
+        width:72px;
+    }
+}
 
 .toolsBtnShowEnable{
     margin-left:10px;
@@ -102,6 +124,12 @@
     _padding-left:22px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_enable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnShowEnable{
+        width:72px;
+        padding-left:22px;
+    }
+}
 
 .toolsBtnShowEnable:hover{
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_activate.png);
@@ -114,6 +142,12 @@
     _padding-left:22px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_activate.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnShowActivate{
+        width:72px;
+        padding-left:22px;
+    }
+}
 
 .toolsBtnShowDisable{
     width:54px;
@@ -122,6 +156,12 @@
     _padding-left:22px;
     background-image:url(/data/web_interface/user_01/img/gadgets_btn_show_disable.png);
 }
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    .toolsBtnShowDisable{
+        width:72px;
+        padding-left:22px;
+    }
+}
 
 .toolsRowName{
     width:390px;

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/attitunes.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/attitunes.xsl	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/attitunes.xsl	2010-06-04 09:36:25 UTC (rev 6106)
@@ -163,19 +163,19 @@
             {
                 var htmlContent = "";
                 var iconId = "attitunesRowIcon_" + name;
-                htmlContent += '<div class="attitunesVSpacer" style="width:10px;"></div>';
+                htmlContent += '<div class="attitunesVSpacer" style="width:10px;">&nbsp;</div>';
                 htmlContent += '<div class="attitunesRowIcon"><img src="' + icon + '" height="34" width="34" id="' + iconId + '"></img></div>';
-                htmlContent += '<div class="attitunesVSpacer" style="width:10px;"></div>';
+                htmlContent += '<div class="attitunesVSpacer" style="width:10px;">&nbsp;</div>';
                 htmlContent += '<span class="attitunesRowName">' + name + '</span>';
-                htmlContent += '<div class="attitunesVSpacer" style="width:26px;"></div>';
+                htmlContent += '<div class="attitunesVSpacer" style="width:26px;">&nbsp;</div>';
                 htmlContent += '<a class="attitunesBtnTitle attitunesBtnStartEnable" id="startId_' + name + '" onclick="javascript:startAttitune(\''+name+'\');return false;" href="#">' + translationStart + '</a>';
-                htmlContent += '<div class="attitunesVSpacer" style="width:8px;"></div>';
+                htmlContent += '<div class="attitunesVSpacer" style="width:8px;">&nbsp;</div>';
                 htmlContent += '<a class="attitunesBtnTitle attitunesBtnStopEnable" id="stopId_' + name + '" onclick="javascript:stopAttitune(\''+name+'\');return false;" href="#">' + translationStop + '</a>';
-                htmlContent += '<div class="attitunesVSpacer" style="width:18px;"></div>';
-                htmlContent += '<a class="attitunesBtnNoTitle attitunesBtnEdit" id="editId_' + name + '" onclick="javascript:setLastAttituneInAction(\''+name+'\');editAttitune();return false;" href="#"></a>';
-                htmlContent += '<div class="attitunesVSpacer" style="width:18px;"></div>';
-                htmlContent += '<a class="attitunesBtnNoTitle attitunesBtnDelete" id="deleteId_' + name + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"></a>';
-                htmlContent += '<div class="frame01Sep2"></div>';
+                htmlContent += '<div class="attitunesVSpacer" style="width:18px;">&nbsp;</div>';
+                htmlContent += '<a class="attitunesBtnNoTitle attitunesBtnEdit" id="editId_' + name + '" onclick="javascript:setLastAttituneInAction(\''+name+'\');editAttitune();return false;" href="#"><p></p></a>';
+                htmlContent += '<div class="attitunesVSpacer" style="width:18px;">&nbsp;</div>';
+                htmlContent += '<a class="attitunesBtnNoTitle attitunesBtnDelete" id="deleteId_' + name + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"><p></p></a>';
+                htmlContent += '<div class="frame01Sep2"/>&nbsp;</div>';
                 return htmlContent;
             }
 
@@ -395,7 +395,7 @@
                     top:0px;">
             <!-- FILTER BAR VIEW -->
             <div class="frame01TopSpace">
-                <div class="attitunesVSpacer" style="width:35px;height:40px;"></div>
+                <div class="attitunesVSpacer" style="width:35px;height:40px;">&#160;</div>
                 <xsl:element name="a">
                     <xsl:attribute name="class">attitunesFilterRadio attitunesFilterRadioActivate</xsl:attribute>
                     <xsl:attribute name="id">attitunesFilterRadioAll</xsl:attribute>
@@ -404,7 +404,7 @@
                 </xsl:element>
             </div>
             <div class="frame01Middle" style="height:465px;">
-                <div class="attitunesListScrollbox" id="attitunesListScrollbox"></div>
+                <div class="attitunesListScrollbox" id="attitunesListScrollbox">&#160;</div>
             </div>
             <div class="frame01Bottom"></div>
         </div>

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/gadgets.xsl	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/gadgets.xsl	2010-06-04 09:36:25 UTC (rev 6106)
@@ -198,11 +198,11 @@
             {
                 var htmlContent = "";
                 var iconId = "gadgetsRowIcon_" + uuid;
-                htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:10px;">&#160;</div>';
                 htmlContent += '<div class="gadgetsRowIcon"><img src="' + icon + '" height="34" width="34" id="' + iconId + '"></img></div>';
-                htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:10px;">&#160;</div>';
                 htmlContent += '<span class="gadgetsRowName">' + name + '</span>';
-                htmlContent += '<div class="gadgetsVSpacer" style="width:26px;"></div>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:26px;">&#160;</div>';
                 if (ondemand == 'true')
                 {
                     htmlContent += '<a class="gadgetsBtnTitle gadgetsBtnStartEnable" id="startId_' + uuid + '" onclick="javascript:startGadget(\''+uuid+'\');return false;" href="#">' + translationStart + '</a>';
@@ -211,7 +211,7 @@
                 {
                     htmlContent += '<a class="gadgetsBtnTitle gadgetsBtnStartDisable" id="startId_' + uuid + '" onclick="return false;" href="#">' + translationStart + '</a>';
                 }
-                htmlContent += '<div class="gadgetsVSpacer" style="width:8px;"></div>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:8px;">&#160;</div>';
                 if (ondemand == 'true')
                 {
                     htmlContent += '<a class="gadgetsBtnTitle gadgetsBtnStopEnable" id="stopId_' + uuid + '" onclick="javascript:stopGadget(\''+uuid+'\');return false;" href="#">' + translationStop + '</a>';
@@ -220,15 +220,15 @@
                 {
                     htmlContent += '<a class="gadgetsBtnTitle gadgetsBtnStopDisable" id="stopId_' + uuid + '" onclick="javascript:return false;" href="#">' + translationStop + '</a>';
                 }
-                htmlContent += '<div class="gadgetsVSpacer" style="width:18px;"></div>';
-                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnHelp" id="helpId_' + uuid + '" onclick="" href="#" name="lbOn" rel="windowGadgetHelp"></a>';
-                htmlContent += '<div class="gadgetsVSpacer" style="width:8px;"></div>';
-                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnConfigure" id="configureId_' + uuid + '" onclick="" href="#" name="lbOn" rel="windowGadgetConfiguration"></a>';
-                htmlContent += '<div class="gadgetsVSpacer" style="width:8px;"></div>';
-                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDuplicate" id="duplicateId_' + uuid + '" onclick="javascript:setLastGadgetInAction(\''+uuid+'\');duplicateUgc();return false;" href="#"></a>';
-                htmlContent += '<div class="gadgetsVSpacer" style="width:18px;"></div>';
-                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDelete" id="deleteId_' + uuid + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"></a>';
-                htmlContent += '<div class="frame01Sep2"></div>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:18px;">&nbsp;</div>';
+                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnHelp" id="helpId_' + uuid + '" onclick="" href="#" name="lbOn" rel="windowGadgetHelp"><p></p></a>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:8px;">&nbsp;</div>';
+                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnConfigure" id="configureId_' + uuid + '" onclick="" href="#" name="lbOn" rel="windowGadgetConfiguration"><p></p></a>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:8px;">&nbsp;</div>';
+                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDuplicate" id="duplicateId_' + uuid + '" onclick="javascript:setLastGadgetInAction(\''+uuid+'\');duplicateUgc();return false;" href="#"><p></p></a>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:18px;">&nbsp;</div>';
+                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDelete" id="deleteId_' + uuid + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"><p></p></a>';
+                htmlContent += '<div class="frame01Sep2"/>&nbsp;</div>';
                 return htmlContent;
             }
 
@@ -564,21 +564,21 @@
                     top:0px;">
             <!-- NOTIFICATION VIEW -->
             <div class="frame01TopSpace">
-                <div class="gadgetsVSpacer" style="width:35px;height:40px;"></div>
+                <div class="gadgetsVSpacer" style="width:35px;height:40px;">&#160;</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>
+                <div class="gadgetsVSpacer" style="width:5px;height:40px;">&#160;</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"/>
                 </xsl:element>
-                <div class="gadgetsVSpacer" style="width:5px;height:40px;"></div>
+                <div class="gadgetsVSpacer" style="width:5px;height:40px;">&#160;</div>
                 <xsl:element name="a">
                     <xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioActivate</xsl:attribute>
                     <xsl:attribute name="id">gadgetsFilterRadioAll</xsl:attribute>
@@ -587,7 +587,7 @@
                 </xsl:element>
             </div>
             <div class="frame01Middle" style="height:465px;">
-                <div class="gadgetsListScrollbox" id="gadgetsListScrollbox"></div>
+                <div class="gadgetsListScrollbox" id="gadgetsListScrollbox">&#160;</div>
             </div>
             <div class="frame01Bottom"></div>
         </div>
@@ -657,7 +657,7 @@
                     style="height:240px"
                     src="">
                 </iframe>
-                <div style="display:table;float:left;height:34px;width:370px"></div>
+                <div style="display:table;float:left;height:34px;width:370px">&#160;</div>
                 <xsl:element name="a">
                     <xsl:attribute name="class">windowBtn</xsl:attribute>
                     <xsl:attribute name="name">lbOff</xsl:attribute>
@@ -688,7 +688,7 @@
                     scrolling="no"
                     src="">
                 </iframe>
-                <div style="display:table;float:left;height:34px;width:300px"></div>
+                <div style="display:table;float:left;height:34px;width:300px">&#160;</div>
                 <xsl:element name="a">
                     <xsl:attribute name="class">windowBtn</xsl:attribute>
                     <xsl:attribute name="name">lbOff</xsl:attribute>

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/livewithtux.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/livewithtux.xsl	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/livewithtux.xsl	2010-06-04 09:36:25 UTC (rev 6106)
@@ -481,7 +481,7 @@
                 <xsl:element name="a">
                     <xsl:attribute name="class">thumbnailBarBtnPrevious</xsl:attribute>
                     <xsl:attribute name="onclick">javascript:previousGadget();return false;</xsl:attribute>
-                    <xsl:attribute name="href">#</xsl:attribute>
+                    <xsl:attribute name="href">#</xsl:attribute><p></p>
                 </xsl:element>
                 <!-- THUMBNAIL BAR -->
                 <div class="thumbnailBarView">
@@ -560,7 +560,7 @@
                 <xsl:element name="a">
                     <xsl:attribute name="class">thumbnailBarBtnNext</xsl:attribute>
                     <xsl:attribute name="onclick">javascript:nextGadget();return false;</xsl:attribute>
-                    <xsl:attribute name="href">#</xsl:attribute>
+                    <xsl:attribute name="href">#</xsl:attribute>&#160;
                 </xsl:element>
             </div>
             <div class="frame01Bottom"></div>

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/online.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/online.xsl	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/online.xsl	2010-06-04 09:36:25 UTC (rev 6106)
@@ -105,22 +105,22 @@
             {
                 var htmlContent = "";
                 var iconId = "gadgetsRowIcon_" + symbolicName;
-                htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:10px;">&nbsp;</div>';
                 htmlContent += '<div class="gadgetsRowIcon"><img src="' + icon + '" height="34" width="34" id="' + iconId + '"></img></div>';
-                htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:10px;">&nbsp;</div>';
                 htmlContent += '<span class="gadgetsRowName2">' + name + '</span>';
-                htmlContent += '<div class="gadgetsVSpacer" style="width:18px;"></div>';
-                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnHelp" id="helpId_' + symbolicName + '" onclick="" href="#" name="lbOn" rel="windowGadgetHelp"></a>';
-                htmlContent += '<div class="gadgetsVSpacer" style="width:8px;"></div>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:18px;">&nbsp;</div>';
+                htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnHelp" id="helpId_' + symbolicName + '" onclick="" href="#" name="lbOn" rel="windowGadgetHelp"><p></p></a>';
+                htmlContent += '<div class="gadgetsVSpacer" style="width:8px;">&nbsp;</div>';
                 if (isAnUpdate == "True")
                 {
-                    htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnUpdate" id="downloadId_' + symbolicName + '" onclick="" href="#" name="lbOn" rel="popupConfirmUpdate"></a>';
+                    htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnUpdate" id="downloadId_' + symbolicName + '" onclick="" href="#" name="lbOn" rel="popupConfirmUpdate"><p></p></a>';
                 }
                 else
                 {
-                    htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDownload" id="downloadId_' + symbolicName + '" onclick="" href="#" name="lbOn" rel="popupConfirmDownload"></a>';
+                    htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDownload" id="downloadId_' + symbolicName + '" onclick="" href="#" name="lbOn" rel="popupConfirmDownload"><p></p></a>';
                 }
-                htmlContent += '<div class="frame01Sep2"></div>';
+                htmlContent += '<div class="frame01Sep2">&nbsp;</div>';
                 return htmlContent;
             }
 
@@ -307,7 +307,7 @@
                     top:0px;">
             <!-- NOTIFICATION VIEW -->
             <div class="frame01TopSpace">
-                <div class="gadgetsVSpacer" style="width:35px;height:40px;"></div>
+                <div class="gadgetsVSpacer" style="width:35px;height:40px;">&#160;</div>
                 <xsl:element name="a">
                     <xsl:attribute name="class">gadgetsFilterRadio gadgetsFilterRadioActivate</xsl:attribute>
                     <xsl:attribute name="id">gadgetsFilterRadioAll</xsl:attribute>
@@ -316,7 +316,7 @@
                 </xsl:element>
             </div>
             <div class="frame01Middle" style="height:465px;">
-                <div class="gadgetsListScrollbox2" id="gadgetsListScrollbox"></div>
+                <div class="gadgetsListScrollbox2" id="gadgetsListScrollbox">&#160;</div>
             </div>
             <div class="frame01Bottom2"></div>
         </div>
@@ -422,7 +422,7 @@
                     style="height:240px"
                     src="">
                 </iframe>
-                <div style="display:table;float:left;height:34px;width:370px"></div>
+                <div style="display:table;float:left;height:34px;width:370px">&#160;</div>
                 <xsl:element name="a">
                     <xsl:attribute name="class">windowBtn</xsl:attribute>
                     <xsl:attribute name="name">lbOff</xsl:attribute>

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/tools.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/tools.xsl	2010-06-04 09:33:02 UTC (rev 6105)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/data/web_interface/user_01/xsl/tools.xsl	2010-06-04 09:36:25 UTC (rev 6106)
@@ -157,7 +157,7 @@
                         <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/start"/>
                     </xsl:element>
                     <span class="toolsRowName"><xsl:value-of select="root/data/attitunes_studio/name"/></span>
-                    <div class="frame01Sep"></div>
+                    <div class="frame01Sep">&#160;</div>
                 </xsl:if>
                 <!-- TUX CONTROLLER -->
                 <xsl:if test="root/data/tux_controller != ''">
@@ -168,7 +168,7 @@
                         <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/start"/>
                     </xsl:element>
                     <span class="toolsRowName"><xsl:value-of select="root/data/tux_controller/name"/></span>
-                    <div class="frame01Sep"></div>
+                    <div class="frame01Sep">&#160;</div>
                 </xsl:if>
                 <!-- GLOBAL SETTINGS -->
                 <xsl:element name="a">
@@ -179,7 +179,7 @@
                     <xsl:attribute name="href">#</xsl:attribute><xsl:value-of select="root/translations/show"/>
                 </xsl:element>
                 <span class="toolsRowName"><xsl:value-of select="root/translations/global_settings"/></span>
-                <div class="frame01Sep"></div>
+                <div class="frame01Sep">&#160;</div>
                 <!-- ONLINE DOCUMENTATION -->
                 <xsl:element name="a">
                     <xsl:attribute name="class">toolsBtnTitle toolsBtnShowEnable</xsl:attribute>
@@ -187,7 +187,7 @@
                     <xsl:attribute name="href"><xsl:value-of select="root/translations/documentation_url"/></xsl:attribute><xsl:value-of select="root/translations/show"/>
                 </xsl:element>
                 <span class="toolsRowName"><xsl:value-of select="root/translations/online_documentation"/></span>
-                <div class="frame01Sep"></div>
+                <div class="frame01Sep">&#160;</div>
                 <!-- ABOUT -->
                 <xsl:if test="root/data/about != ''">
                     <xsl:element name="a">
@@ -225,7 +225,7 @@
                     style="height:240px"
                     src="">
                 </iframe>
-                <div style="display:table;float:left;height:34px;width:370px"></div>
+                <div style="display:table;float:left;height:34px;width:370px">&#160;</div>
                 <xsl:element name="a">
                     <xsl:attribute name="class">windowBtn</xsl:attribute>
                     <xsl:attribute name="name">lbOff</xsl:attribute>
@@ -256,7 +256,7 @@
                     scrolling="no"
                     src="">
                 </iframe>
-                <div style="display:table;float:left;height:34px;width:300px"></div>
+                <div style="display:table;float:left;height:34px;width:300px">&#160;</div>
                 <xsl:element name="a">
                     <xsl:attribute name="class">windowBtn</xsl:attribute>
                     <xsl:attribute name="name">lbOff</xsl:attribute>

[tuxdroid-svn] r6107 - software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo

From: remi <c2m...@c2...> - 2010-06-04 09:46:53

Author: remi
Date: 2010-06-04 11:38:03 +0200 (Fri, 04 Jun 2010)
New Revision: 6107

Modified:
   software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/TDSConfiguration.py
Log:
* Removed localhost access limitation of the server on Windows.

Modified: software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/TDSConfiguration.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/TDSConfiguration.py	2010-06-04 09:36:25 UTC (rev 6106)
+++ software_suite_v3/smart-core/smart-server/branches/diyse-consortium-june-2010-demo/TDSConfiguration.py	2010-06-04 09:38:03 UTC (rev 6107)
@@ -35,7 +35,7 @@
 # ------------------------------------------------------------------------------
 # Host address for the server sockets
 if os.name == 'nt':
-    TDS_CONF_HOST_ADDRESS = '127.0.0.1'
+    TDS_CONF_HOST_ADDRESS = ''
 else:
     TDS_CONF_HOST_ADDRESS = ''

[tuxdroid-svn] r6104 - software_suite_v3/smart-core/smart-api/python/trunk

From: remi <c2m...@c2...> - 2010-04-12 07:52:28

Author: remi
Date: 2010-04-12 09:51:57 +0200 (Mon, 12 Apr 2010)
New Revision: 6104

Removed:
   software_suite_v3/smart-core/smart-api/python/trunk/installer.nsi
Log:
* Removed old linux script

Deleted: software_suite_v3/smart-core/smart-api/python/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-api/python/trunk/installer.nsi	2010-03-22 10:51:48 UTC (rev 6103)
+++ software_suite_v3/smart-core/smart-api/python/trunk/installer.nsi	2010-04-12 07:51:57 UTC (rev 6104)
@@ -1,130 +0,0 @@
-; installer.nsi
-; This installer which install python tuxisalive package
-; -----------------------------------------------------------------------------
-
-; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "Smart API for python"
-!define PRODUCT_VERSION "0.5.0-b0"
-
-; Output names
-!define FINAL_INSTALLER_EXE "pySmartAPIInstaller_${PRODUCT_VERSION}.exe"
-!define UNINSTALLER_EXE "pySmartAPIUninstaller.exe"
-
-; The name of the installer
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-
-; The file to write
-OutFile "${FINAL_INSTALLER_EXE}"
-
-; The default installation directory
-InstallDir c:\tuxdroid\bin\python\Lib\site-packages\tuxisalive
-
-; Request application privileges for Windows Vista
-RequestExecutionLevel user
-
-; Get the Tuxdroid installation paths
-var /GLOBAL TUXDROID_PATH
-var /GLOBAL TUXDROID_PYTHON_PATH
-var /GLOBAL UNINSTALLERS_SUB_PATH
-
-; -----------------------------------------------------------------------------
-; Section Pre-installation
-; -----------------------------------------------------------------------------
-Section -Pre
-!ifndef INNER
-    ; Needed
-    SectionIn RO
-    ; Get the Tuxdroid installation path
-    ReadRegStr $TUXDROID_PATH HKLM "SOFTWARE\Tux Droid\Installation" "Install_Dir"
-    ; Uninstall old installations of Smart-API
-    DetailPrint "Uninstalling old versions"
-    SetDetailsPrint none
-    ExecWait '"$TUXDROID_PATH\uninstallers\sub\${UNINSTALLER_EXE}" /S _?=$TUXDROID_PATH\uninstallers'
-    SetDetailsPrint textonly
-!endif
-SectionEnd
-
-; -----------------------------------------------------------------------------
-; Section ""
-; -----------------------------------------------------------------------------
-Section ""
-    ; Get the Tuxdroid installation paths
-    ReadRegStr $TUXDROID_PATH HKLM "SOFTWARE\Tux Droid\Installation" "Install_Dir"
-    StrCpy $TUXDROID_PYTHON_PATH "$TUXDROID_PATH\softwares\python2.4"
-    StrCpy $UNINSTALLERS_SUB_PATH "$TUXDROID_PATH\uninstallers\sub"
-
-    ; Write the files
-    CreateDirectory "$TUXDROID_PYTHON_PATH\Lib\site-packages\tuxisalive"
-    SetOutPath "$TUXDROID_PYTHON_PATH\Lib\site-packages\tuxisalive"
-    File /r /x *.pyc /x *.svn tuxisalive\*
-
-    CreateDirectory "$TUXDROID_PATH\resources\images"
-    SetOutPath "$TUXDROID_PATH\resources\images"
-    File tuxsh.ico
-
-    ; Write bat file
-    Delete "$TUXDROID_PATH\bin\tuxsh.bat"
-    Push '"$TUXDROID_PYTHON_PATH\python.exe" -i "$TUXDROID_PYTHON_PATH\Lib\site-packages\tuxisalive\api\sh.py"'
-    Push "$TUXDROID_PATH\bin\tuxsh.bat"
-    Call WriteToFile
-
-    ; Reveal shortcuts to all users
-    SetShellVarContext all
-    ; Write shortcut in start menu
-    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}"
-
-    ; Quit the installer
-    Quit
-SectionEnd
-
-; -----------------------------------------------------------------------------
-; Section "Uninstall"
-; -----------------------------------------------------------------------------
-Section "Uninstall"
-    ; Get the Tuxdroid installation paths
-    ReadRegStr $TUXDROID_PATH HKLM "SOFTWARE\Tux Droid\Installation" "Install_Dir"
-    StrCpy $TUXDROID_PYTHON_PATH "$TUXDROID_PATH\softwares\python2.4"
-    StrCpy $UNINSTALLERS_SUB_PATH "$TUXDROID_PATH\uninstallers\sub"
-
-    ; Remove files and uninstaller
-    Delete "$TUXDROID_PATH\bin\tuxsh.bat"
-    Delete "$TUXDROID_PATH\resources\images\tuxsh.ico"
-    RMDir /r "$TUXDROID_PYTHON_PATH\Lib\site-packages\tuxisalive"
-    Delete "$UNINSTALLERS_SUB_PATH\${UNINSTALLER_EXE}"
-
-    ; Reveal shortcuts to all users
-    SetShellVarContext all
-    ; Remove shortcuts
-    Delete "$SMPROGRAMS\TuxBox 2.0\Tuxware\Tux Droid Shell.lnk"
-
-    ; Quit the uninstaller
-    Quit
-SectionEnd
-
-; -----------------------------------------------------------------------------
-; Function to write a file
-; -----------------------------------------------------------------------------
-Function WriteToFile
- Exch $0 ;file to write to
- Exch
- Exch $1 ;text to write
-
-  FileOpen $0 $0 a #open file
-   FileSeek $0 0 END #go to end
-   FileWrite $0 $1 #write to file
-  FileClose $0
-
- Pop $1
- Pop $0
-FunctionEnd
-
-!macro WriteToFile String File
- Push "${String}"
- Push "${File}"
-  Call WriteToFile
-!macroend
-
-!define WriteToFile "!insertmacro WriteToFile"
\ No newline at end of file

[tuxdroid-svn] r6103 - software_suite_v3/software/plugin/plugin-hotmail/trunk/resources

From: jerome <c2m...@c2...> - 2010-03-22 10:51:59

Author: jerome
Date: 2010-03-22 11:51:48 +0100 (Mon, 22 Mar 2010)
New Revision: 6103

Modified:
   software_suite_v3/software/plugin/plugin-hotmail/trunk/resources/plugin.xml
Log:
* Added platform.

Modified: software_suite_v3/software/plugin/plugin-hotmail/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-hotmail/trunk/resources/plugin.xml	2010-03-22 10:43:25 UTC (rev 6102)
+++ software_suite_v3/software/plugin/plugin-hotmail/trunk/resources/plugin.xml	2010-03-22 10:51:48 UTC (rev 6103)
@@ -11,6 +11,7 @@
 		<iconFile>resources/plugin.png</iconFile>
 		<executionMode>service</executionMode>
 		<uuid>f63af23e-1fe0-4389-b89b-bc5c8185a6b2</uuid>
+        <platform>windows</platform>
 	</description>
 	<parameters>
 		<parameter

[tuxdroid-svn] r6102 - software_suite_v3/software/plugin/plugin-yahoo/trunk/resources

From: jerome <c2m...@c2...> - 2010-03-22 10:43:41

Author: jerome
Date: 2010-03-22 11:43:25 +0100 (Mon, 22 Mar 2010)
New Revision: 6102

Modified:
   software_suite_v3/software/plugin/plugin-yahoo/trunk/resources/plugin.xml
Log:
* Added platform.

Modified: software_suite_v3/software/plugin/plugin-yahoo/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-yahoo/trunk/resources/plugin.xml	2010-03-16 08:39:44 UTC (rev 6101)
+++ software_suite_v3/software/plugin/plugin-yahoo/trunk/resources/plugin.xml	2010-03-22 10:43:25 UTC (rev 6102)
@@ -11,6 +11,7 @@
 		<iconFile>resources/plugin.png</iconFile>
 		<executionMode>service</executionMode>
 		<uuid>f63af23e-1fe0-4389-b89b-acdc8115a6c6</uuid>
+                <platform>windows</platform>
 	</description>
 	<parameters>
 		<parameter

[tuxdroid-svn] r6101 - software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/tags

From: jerome <c2m...@c2...> - 2010-03-16 08:39:53

Author: jerome
Date: 2010-03-16 09:39:44 +0100 (Tue, 16 Mar 2010)
New Revision: 6101

Added:
   software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/tags/0.2/
Log:
* Tagged 0.2

[tuxdroid-svn] r6100 - software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/tags

From: jerome <c2m...@c2...> - 2010-03-16 08:39:28

Author: jerome
Date: 2010-03-16 09:39:19 +0100 (Tue, 16 Mar 2010)
New Revision: 6100

Added:
   software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/tags/0.2/
Log:
* Tagged 0.2

[tuxdroid-svn] r6099 - software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/tags

From: jerome <c2m...@c2...> - 2010-03-16 08:39:02

Author: jerome
Date: 2010-03-16 09:38:55 +0100 (Tue, 16 Mar 2010)
New Revision: 6099

Added:
   software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/tags/0.2/
Log:
* Tagged 0.2

[tuxdroid-svn] r6098 - software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/tags

From: jerome <c2m...@c2...> - 2010-03-16 08:38:38

Author: jerome
Date: 2010-03-16 09:38:29 +0100 (Tue, 16 Mar 2010)
New Revision: 6098

Added:
   software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/tags/0.2/
Log:
* Tagged 0.2

[tuxdroid-svn] r6097 - software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/tags

From: jerome <c2m...@c2...> - 2010-03-16 08:38:08

Author: jerome
Date: 2010-03-16 09:37:58 +0100 (Tue, 16 Mar 2010)
New Revision: 6097

Added:
   software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/tags/0.2/
Log:
* Tagged 0.2

[tuxdroid-svn] r6096 - software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/tags

From: jerome <c2m...@c2...> - 2010-03-16 08:37:37

Author: jerome
Date: 2010-03-16 09:37:28 +0100 (Tue, 16 Mar 2010)
New Revision: 6096

Added:
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/tags/0.2/
Log:
* Tagged 0.2

[tuxdroid-svn] r6095 - software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/tags

From: jerome <c2m...@c2...> - 2010-03-16 08:36:45

Author: jerome
Date: 2010-03-16 09:36:37 +0100 (Tue, 16 Mar 2010)
New Revision: 6095

Added:
   software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/tags/0.2/
Log:
* Tagged 0.2

[tuxdroid-svn] r6094 - in software_suite_v3/software/plugin/plugins-demo: bash-HelloWorld-plugin/trunk/resources cpp-HelloWorld-plugin/trunk/resources java-HelloWorld-plugin/trunk/resources pascal-HelloWorld-plugin/trunk/resources perl-HelloWorld-plugin/trunk/resources python-HelloWorld-plugin/trunk/resources ruby-HelloWorld-plugin/trunk/resources

From: jerome <c2m...@c2...> - 2010-03-16 08:35:04

Author: jerome
Date: 2010-03-16 09:34:44 +0100 (Tue, 16 Mar 2010)
New Revision: 6094

Added:
   software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/attitunes/
   software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/en.po
   software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/en.wiki
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/attitunes/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/en.po
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/en.wiki
   software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/en.po
   software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/en.wiki
   software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/attitunes/
   software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/en.po
   software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/en.wiki
   software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/attitunes/
   software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/en.po
   software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/en.wiki
   software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/attitunes/
   software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/en.po
   software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/en.wiki
   software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/attitunes/
   software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/en.po
   software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/en.wiki
Modified:
   software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/plugin.xml
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.xml
   software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/plugin.xml
   software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/plugin.xml
   software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/plugin.xml
   software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/plugin.xml
   software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/plugin.xml
Log:
* Updated demos plugins ( more complete than before ).

Added: software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/en.po	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/en.po	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,20 @@
+msgid "Hello World Bash Sample Plugin"
+msgstr "Hello World Bash Sample Plugin"
+
+msgid "Hello world in scheduled mode"
+msgstr "Hello world in scheduled mode"
+
+msgid "Message sent when I'm saying hello"
+msgstr "Message sent when I'm saying hello"
+
+msgid "Hello world in bash"
+msgstr "Hello world in bash"
+
+msgid "How many time the message will be throwed"
+msgstr "How many time the message will be throwed"
+
+msgid "Run the plugin"
+msgstr "Run the plugin"
+
+msgid "Start check command for scheduled Hello world."
+msgstr "Start check command for scheduled Hello world."

Added: software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/en.wiki
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/en.wiki	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/en.wiki	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,2 @@
+== Synopsis ==
+Bash simple "Hello World" plugin.

Modified: software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-11 14:07:49 UTC (rev 6093)
+++ software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-16 08:34:44 UTC (rev 6094)
@@ -7,7 +7,7 @@
 		<name>Hello World Bash Sample Plugin</name>
 		<description>This plugin throws a simple Hello World notification in bash</description>
 		<author>jerome conan</author>
-		<version>0.1</version>
+		<version>0.2</version>
 		<iconFile>resources/HelloWorld.png</iconFile>
 		<executionMode>command</executionMode>
 		<!-- Plugin uuid -->

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/en.po	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/en.po	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,20 @@
+msgid "Hello World C++ Sample Plugin"
+msgstr "Hello World C++ Sample Plugin"
+
+msgid "Hello world in scheduled mode"
+msgstr "Hello world in scheduled mode"
+
+msgid "Message sent when I'm saying hello"
+msgstr "Message sent when I'm saying hello"
+
+msgid "Hello world in c++"
+msgstr "Hello world in c++"
+
+msgid "How many time the message will be throwed"
+msgstr "How many time the message will be throwed"
+
+msgid "Run the plugin"
+msgstr "Run the plugin"
+
+msgid "Start check command for scheduled Hello world."
+msgstr "Start check command for scheduled Hello world."

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/en.wiki
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/en.wiki	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/en.wiki	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,2 @@
+== Synopsis ==
+C++ simple "Hello World" plugin.

Modified: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-11 14:07:49 UTC (rev 6093)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-16 08:34:44 UTC (rev 6094)
@@ -7,7 +7,7 @@
 		<name>Hello World C++ Sample Plugin</name>
 		<description>This plugin throws a simple Hello World notification in c++</description>
 		<author>jerome conan</author>
-		<version>0.1</version>
+		<version>0.2</version>
 		<iconFile>resources/HelloWorld.png</iconFile>
 		<executionMode>command</executionMode>
 		<!-- Plugin uuid -->

Added: software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/en.po	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/en.po	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,23 @@
+msgid "Hello World Java Sample Plugin"
+msgstr "Hello World Java Sample Plugin"
+
+msgid "Hello world in scheduled mode"
+msgstr "Hello world in scheduled mode"
+
+msgid "Message sent when I'm saying hello"
+msgstr "Message sent when I'm saying hello"
+
+msgid "Hello world in java"
+msgstr "Hello world in java"
+
+msgid "How many time the message will be throwed"
+msgstr "How many time the message will be throwed"
+
+msgid "Run the plugin"
+msgstr "Run the plugin"
+
+msgid "Start check command for scheduled Hello world."
+msgstr "Start check command for scheduled Hello world."
+
+msgid "This plugin throws a simple Hello World notification in java"
+msgstr "This plugin throws a simple Hello World notification in java"

Added: software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/en.wiki
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/en.wiki	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/en.wiki	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,2 @@
+== Synopsis ==
+Java simple "Hello World" plugin.

Modified: software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-11 14:07:49 UTC (rev 6093)
+++ software_suite_v3/software/plugin/plugins-demo/java-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-16 08:34:44 UTC (rev 6094)
@@ -7,7 +7,7 @@
 		<name>Hello World Java Sample Plugin</name>
 		<description>This plugin throws a simple Hello World notification in java</description>
 		<author>jerome conan</author>
-		<version>0.1</version>
+		<version>0.2</version>
 		<iconFile>resources/HelloWorld.png</iconFile>
 		<executionMode>command</executionMode>
 		<!-- Plugin uuid -->

Added: software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/en.po	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/en.po	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,20 @@
+msgid "Hello World Pascal Sample Plugin"
+msgstr "Hello World Pascal Sample Plugin"
+
+msgid "Hello world in scheduled mode"
+msgstr "Hello world in scheduled mode"
+
+msgid "Message sent when I'm saying hello"
+msgstr "Message sent when I'm saying hello"
+
+msgid "Hello world in pascal"
+msgstr "Hello world in pascal"
+
+msgid "How many time the message will be throwed"
+msgstr "How many time the message will be throwed"
+
+msgid "Run the plugin"
+msgstr "Run the plugin"
+
+msgid "Start check command for scheduled Hello world."
+msgstr "Start check command for scheduled Hello world.
\ No newline at end of file

Added: software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/en.wiki
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/en.wiki	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/en.wiki	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,2 @@
+== Synopsis ==
+Simple Hello World pascal d.
\ No newline at end of file

Modified: software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-11 14:07:49 UTC (rev 6093)
+++ software_suite_v3/software/plugin/plugins-demo/pascal-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-16 08:34:44 UTC (rev 6094)
@@ -7,7 +7,7 @@
 		<name>Hello World free pascal Sample Plugin</name>
 		<description>This plugin throws a simple Hello World notification in pascal</description>
 		<author>jerome conan</author>
-		<version>0.1</version>
+		<version>0.2</version>
 		<iconFile>resources/plugin.png</iconFile>
 		<executionMode>command</executionMode>
 		<uuid>548f7a9a-567c-423e-a0dd-102ff68a3333</uuid>

Added: software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/en.po	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/en.po	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,20 @@
+msgid "Hello World Perl Sample Plugin"
+msgstr "Hello World Perl Sample Plugin"
+
+msgid "Hello world in scheduled mode"
+msgstr "Hello world in scheduled mode"
+
+msgid "Message sent when I'm saying hello"
+msgstr "Message sent when I'm saying hello"
+
+msgid "Hello world in perl"
+msgstr "Hello world in perl"
+
+msgid "How many time the message will be throwed"
+msgstr "How many time the message will be throwed"
+
+msgid "Run the plugin"
+msgstr "Run the plugin"
+
+msgid "Start check command for scheduled Hello world."
+msgstr "Start check command for scheduled Hello world."
\ No newline at end of file

Added: software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/en.wiki
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/en.wiki	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/en.wiki	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,2 @@
+== Synopsis ==
+Perl simple "Hello World" plugin.

Modified: software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-11 14:07:49 UTC (rev 6093)
+++ software_suite_v3/software/plugin/plugins-demo/perl-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-16 08:34:44 UTC (rev 6094)
@@ -7,7 +7,7 @@
 		<name>Hello World Perl Sample Plugin</name>
 		<description>This plugin throws a simple Hello World notification in perl</description>
 		<author>jerome conan</author>
-		<version>0.1</version>
+		<version>0.2</version>
 		<iconFile>resources/HelloWorld.png</iconFile>
 		<executionMode>command</executionMode>
 		<!-- Plugin uuid -->

Added: software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/en.po	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/en.po	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,20 @@
+msgid "Hello World Python Sample Plugin"
+msgstr "Hello World Python Sample Plugin"
+
+msgid "Hello world in scheduled mode"
+msgstr "Hello world in scheduled mode"
+
+msgid "Message sent when I'm saying hello"
+msgstr "Message sent when I'm saying hello"
+
+msgid "Hello world in python"
+msgstr "Hello world in python"
+
+msgid "How many time the message will be throwed"
+msgstr "How many time the message will be throwed"
+
+msgid "Run the plugin"
+msgstr "Run the plugin"
+
+msgid "Start check command for scheduled Hello world."
+msgstr "Start check command for scheduled Hello world."

Added: software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/en.wiki
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/en.wiki	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/en.wiki	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,2 @@
+== Synopsis ==
+Python simple "Hello World" plugin.

Modified: software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-11 14:07:49 UTC (rev 6093)
+++ software_suite_v3/software/plugin/plugins-demo/python-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-16 08:34:44 UTC (rev 6094)
@@ -7,7 +7,7 @@
 		<name>Hello World Python Sample Plugin</name>
 		<description>This plugin throws a simple Hello World notification in python</description>
 		<author>jerome conan</author>
-		<version>0.1</version>
+		<version>0.2</version>
 		<iconFile>resources/HelloWorld.png</iconFile>
 		<executionMode>command</executionMode>
 		<!-- Plugin uuid -->

Added: software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/en.po	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/en.po	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,20 @@
+msgid "Hello World Ruby Sample Plugin"
+msgstr "Hello World Ruby Sample Plugin"
+
+msgid "Hello world in scheduled mode"
+msgstr "Hello world in scheduled mode"
+
+msgid "Message sent when I'm saying hello"
+msgstr "Message sent when I'm saying hello"
+
+msgid "Hello world in ruby"
+msgstr "Hello world in ruby"
+
+msgid "How many time the message will be throwed"
+msgstr "How many time the message will be throwed"
+
+msgid "Run the plugin"
+msgstr "Run the plugin"
+
+msgid "Start check command for scheduled Hello world."
+msgstr "Start check command for scheduled Hello world."

Added: software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/en.wiki
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/en.wiki	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/en.wiki	2010-03-16 08:34:44 UTC (rev 6094)
@@ -0,0 +1,2 @@
+== Synopsis ==
+Ruby simple "Hello World" plugin.

Modified: software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-11 14:07:49 UTC (rev 6093)
+++ software_suite_v3/software/plugin/plugins-demo/ruby-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-16 08:34:44 UTC (rev 6094)
@@ -7,7 +7,7 @@
 		<name>Hello World Ruby Sample Plugin</name>
 		<description>This plugin throws a simple Hello World notification in ruby</description>
 		<author>jerome conan</author>
-		<version>0.1</version>
+		<version>0.2</version>
 		<iconFile>resources/HelloWorld.png</iconFile>
 		<executionMode>command</executionMode>
 		<!-- Plugin uuid -->

[tuxdroid-svn] r6093 - software_suite_v3/software/gadget/default/trunk/gadget_d71cec40-c44e-73d7-e63f-a152986354e0

From: jerome <c2m...@c2...> - 2010-03-11 14:08:09

Author: jerome
Date: 2010-03-11 15:07:49 +0100 (Thu, 11 Mar 2010)
New Revision: 6093

Modified:
   software_suite_v3/software/gadget/default/trunk/gadget_d71cec40-c44e-73d7-e63f-a152986354e0/gadget.xml
Log:
* Fixed default url feed value.

Modified: software_suite_v3/software/gadget/default/trunk/gadget_d71cec40-c44e-73d7-e63f-a152986354e0/gadget.xml
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_d71cec40-c44e-73d7-e63f-a152986354e0/gadget.xml	2010-03-08 14:11:11 UTC (rev 6092)
+++ software_suite_v3/software/gadget/default/trunk/gadget_d71cec40-c44e-73d7-e63f-a152986354e0/gadget.xml	2010-03-11 14:07:49 UTC (rev 6093)
@@ -19,7 +19,7 @@
             <visible>true</visible>
         </param_00>
         <param_01>
-            <defaultValue>http://www.livewithapenguin.com/rss.xml</defaultValue>
+            <defaultValue>http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss.xml</defaultValue>
             <name>address</name>
             <visible>true</visible>
         </param_01>

[tuxdroid-svn] r6092 - in software_suite_v3/software/gadget: default/trunk online_only/trunk online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080

From: jerome <c2m...@c2...> - 2010-03-08 14:11:24

Author: jerome
Date: 2010-03-08 15:11:11 +0100 (Mon, 08 Mar 2010)
New Revision: 6092

Added:
   software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/
   software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.png
   software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.pot
   software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.xml
   software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/help.wiki
Removed:
   software_suite_v3/software/gadget/default/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/
Modified:
   software_suite_v3/software/gadget/default/trunk/names_to_uuids_list.txt
   software_suite_v3/software/gadget/online_only/trunk/names_to_uuids_list.txt
Log:
* Moved tux valentine gadget from default to online only

Modified: software_suite_v3/software/gadget/default/trunk/names_to_uuids_list.txt
===================================================================
--- software_suite_v3/software/gadget/default/trunk/names_to_uuids_list.txt	2010-03-08 13:43:44 UTC (rev 6091)
+++ software_suite_v3/software/gadget/default/trunk/names_to_uuids_list.txt	2010-03-08 14:11:11 UTC (rev 6092)
@@ -10,4 +10,3 @@
 E-Mail              : 84628d00-1e17-62dd-eaa4-7b11436f3211
 GMail               : 06d0b3ba-7781-4d2d-bd48-520cfa18e0c9
 RSS                 : d71cec40-c44e-73d7-e63f-a152986354e0
-Valentine           : 25ad17f4-45d5-bfce-5670-f7e856dd0080

Added: software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.png
===================================================================
(Binary files differ)


Property changes on: software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.pot
===================================================================
--- software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.pot	                        (rev 0)
+++ software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.pot	2010-03-08 14:11:11 UTC (rev 6092)
@@ -0,0 +1,8 @@
+msgid "Tux Valentine"
+msgstr ""
+
+msgid "Tux Valentine"
+msgstr ""
+
+msgid "Happy Valentux..."
+msgstr ""

Added: software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.xml
===================================================================
--- software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.xml	                        (rev 0)
+++ software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/gadget.xml	2010-03-08 14:11:11 UTC (rev 6092)
@@ -0,0 +1,43 @@
+<gadget>
+    <description>
+        <author>Kysoh</author>
+        <category>Misc</category>
+        <defaultLanguage>all</defaultLanguage>
+        <description>Happy Valentux...</description>
+        <iconFile>gadget.png</iconFile>
+        <name>Tux Valentine</name>
+        <onDemandIsAble>false</onDemandIsAble>
+        <platform>all</platform>
+        <ttsName>Tux Valentine</ttsName>
+        <uuid>25ad17f4-45d5-bfce-5670-f7e856dd0080</uuid>
+        <version>0.0.1</version>
+    </description>
+    <parameters>
+        <param_00>
+            <defaultValue>Normal</defaultValue>
+            <name>frequency</name>
+            <visible>true</visible>
+        </param_00>
+        <param_01>
+            <defaultValue> </defaultValue>
+            <name>locutor</name>
+            <visible>false</visible>
+        </param_01>
+    </parameters>
+    <parentPlugin>
+        <url>http://ftp.kysoh.com/</url>
+        <uuid>110fb66b-d43e-4fbf-a692-02659aa0a622</uuid>
+        <version>0.0.1</version>
+    </parentPlugin>
+    <tasks>
+        <task_00>
+            <activated>true</activated>
+            <date>0000/00/00</date>
+            <delay>00:00:10</delay>
+            <hoursBegin>00:00:00</hoursBegin>
+            <hoursEnd>23:59:59</hoursEnd>
+            <name>Activation</name>
+            <weekMask>true,true,true,true,true,true,true</weekMask>
+        </task_00>
+    </tasks>
+</gadget>

Added: software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/help.wiki
===================================================================
--- software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/help.wiki	                        (rev 0)
+++ software_suite_v3/software/gadget/online_only/trunk/gadget_25ad17f4-45d5-bfce-5670-f7e856dd0080/help.wiki	2010-03-08 14:11:11 UTC (rev 6092)
@@ -0,0 +1,2 @@
+=Description=
+Happy Valentux...

Modified: software_suite_v3/software/gadget/online_only/trunk/names_to_uuids_list.txt
===================================================================
--- software_suite_v3/software/gadget/online_only/trunk/names_to_uuids_list.txt	2010-03-08 13:43:44 UTC (rev 6091)
+++ software_suite_v3/software/gadget/online_only/trunk/names_to_uuids_list.txt	2010-03-08 14:11:11 UTC (rev 6092)
@@ -7,3 +7,4 @@
 Merry Tuxmas        : 4d6ec4f1-9fd7-4092-a3d6-dd0c6e578051
 Yahoo! Mail         : 84a7480e-35a9-e948-f346-d40a61d27c06
 Hotmail             : 41ff6889-26cc-16f1-fc79-bf0aa38624c9 
+Valentine           : 25ad17f4-45d5-bfce-5670-f7e856dd0080

[tuxdroid-svn] r6091 - software_suite_v3/software/plugin/plugin-feed/trunk/resources

From: jerome <c2m...@c2...> - 2010-03-08 13:43:57

Author: jerome
Date: 2010-03-08 14:43:44 +0100 (Mon, 08 Mar 2010)
New Revision: 6091

Modified:
   software_suite_v3/software/plugin/plugin-feed/trunk/resources/de.po
   software_suite_v3/software/plugin/plugin-feed/trunk/resources/en.po
   software_suite_v3/software/plugin/plugin-feed/trunk/resources/fr.po
   software_suite_v3/software/plugin/plugin-feed/trunk/resources/nl.po
   software_suite_v3/software/plugin/plugin-feed/trunk/resources/plugin.pot
Log:
* Updated resources to match new default feed location.

Modified: software_suite_v3/software/plugin/plugin-feed/trunk/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-feed/trunk/resources/de.po	2010-03-08 13:40:12 UTC (rev 6090)
+++ software_suite_v3/software/plugin/plugin-feed/trunk/resources/de.po	2010-03-08 13:43:44 UTC (rev 6091)
@@ -53,5 +53,5 @@
 msgid "Start me daily"
 msgstr "Berichte mir täglich"
 
-msgid "http://www.livewithapenguin.com/rss.xml"
-msgstr "http://www.livewithapenguin.com/rss/rss-de.xml"
+msgid "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss.xml"
+msgstr "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss-de.xml"

Modified: software_suite_v3/software/plugin/plugin-feed/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-feed/trunk/resources/en.po	2010-03-08 13:40:12 UTC (rev 6090)
+++ software_suite_v3/software/plugin/plugin-feed/trunk/resources/en.po	2010-03-08 13:43:44 UTC (rev 6091)
@@ -53,5 +53,5 @@
 msgid "Start me daily"
 msgstr "Give me a daily report"
 
-msgid "http://www.livewithapenguin.com/rss.xml"
-msgstr "http://www.livewithapenguin.com/rss/rss-en.xml"
+msgid "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss.xml"
+msgstr "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss-en.xml"

Modified: software_suite_v3/software/plugin/plugin-feed/trunk/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-feed/trunk/resources/fr.po	2010-03-08 13:40:12 UTC (rev 6090)
+++ software_suite_v3/software/plugin/plugin-feed/trunk/resources/fr.po	2010-03-08 13:43:44 UTC (rev 6091)
@@ -53,5 +53,5 @@
 msgid "Start me daily"
 msgstr "Me faire un rapport quotidiennement"
 
-msgid "http://www.livewithapenguin.com/rss.xml"
-msgstr "http://www.livewithapenguin.com/rss/rss-fr.xml"
+msgid "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss.xml"
+msgstr "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss-fr.xml"

Modified: software_suite_v3/software/plugin/plugin-feed/trunk/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-feed/trunk/resources/nl.po	2010-03-08 13:40:12 UTC (rev 6090)
+++ software_suite_v3/software/plugin/plugin-feed/trunk/resources/nl.po	2010-03-08 13:43:44 UTC (rev 6091)
@@ -53,5 +53,5 @@
 msgid "Start me daily"
 msgstr "Geef me een dagelijks rapport"
 
-msgid "http://www.livewithapenguin.com/rss.xml"
-msgstr "http://www.livewithapenguin.com/rss/rss-nl.xml"
+msgid "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss.xml"
+msgstr "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss-nl.xml"

Modified: software_suite_v3/software/plugin/plugin-feed/trunk/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-feed/trunk/resources/plugin.pot	2010-03-08 13:40:12 UTC (rev 6090)
+++ software_suite_v3/software/plugin/plugin-feed/trunk/resources/plugin.pot	2010-03-08 13:43:44 UTC (rev 6091)
@@ -48,3 +48,6 @@
 
 msgid "Start me daily"
 msgstr ""
+
+msgid "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss.xml"
+msgstr ""

[tuxdroid-svn] r6090 - in software_suite_v3/software/plugin/plugin-feed/trunk: resources src/net/karmaLab/tuxDroid/plugins

From: jerome <c2m...@c2...> - 2010-03-08 13:40:24

Author: jerome
Date: 2010-03-08 14:40:12 +0100 (Mon, 08 Mar 2010)
New Revision: 6090

Modified:
   software_suite_v3/software/plugin/plugin-feed/trunk/resources/plugin.xml
   software_suite_v3/software/plugin/plugin-feed/trunk/src/net/karmaLab/tuxDroid/plugins/FeedPlugin.java
Log:
* Updated default rss location.

Modified: software_suite_v3/software/plugin/plugin-feed/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-feed/trunk/resources/plugin.xml	2010-03-08 13:18:00 UTC (rev 6089)
+++ software_suite_v3/software/plugin/plugin-feed/trunk/resources/plugin.xml	2010-03-08 13:40:12 UTC (rev 6090)
@@ -27,7 +27,7 @@
 			name="address"
 			description="Feed Address"
 			type="string"
-			defaultValue="http://www.livewithapenguin.com/rss.xml" />
+			defaultValue="http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss.xml" />
 		<parameter
 			category="Options"
 			name="numberOfEntries"

Modified: software_suite_v3/software/plugin/plugin-feed/trunk/src/net/karmaLab/tuxDroid/plugins/FeedPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-feed/trunk/src/net/karmaLab/tuxDroid/plugins/FeedPlugin.java	2010-03-08 13:18:00 UTC (rev 6089)
+++ software_suite_v3/software/plugin/plugin-feed/trunk/src/net/karmaLab/tuxDroid/plugins/FeedPlugin.java	2010-03-08 13:40:12 UTC (rev 6090)
@@ -61,7 +61,7 @@
 	}
 
 	public static class Configuration extends SimplePluginConfiguration {
-		private String address = "http://artisan.karma-lab.net/rss.xml";
+		private String address = "http://ftp.kysoh.com/ssv3/misc/rss_feeds/rss.xml";
 
 		private boolean enabled = true;

[tuxdroid-svn] r6089 - in software_suite_v3/software/plugin/plugin-facebook/trunk: . resources

From: jerome <c2m...@c2...> - 2010-03-08 13:18:12

Author: jerome
Date: 2010-03-08 14:18:00 +0100 (Mon, 08 Mar 2010)
New Revision: 6089

Modified:
   software_suite_v3/software/plugin/plugin-facebook/trunk/pom.xml
   software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml
Log:
* trunk : 5.0

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/pom.xml	2010-03-08 13:17:21 UTC (rev 6088)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/pom.xml	2010-03-08 13:18:00 UTC (rev 6089)
@@ -4,7 +4,7 @@
     <groupId>com.kysoh</groupId>
     <artifactId>plugin-facebook</artifactId>
     <packaging>jar</packaging>
-    <version>4.0</version>
+    <version>5.0</version>
     <name>Facebook plugin for Tux Droid</name>
     <url>http://www.tuxisalive.com</url>
     

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml	2010-03-08 13:17:21 UTC (rev 6088)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml	2010-03-08 13:18:00 UTC (rev 6089)
@@ -8,7 +8,7 @@
 		<name>Facebook Plugin</name>
 		<description>The Facebook plugin will notify you of any updates on your Facebook account.</description>
 		<author>Jerome Conan</author>
-		<version>4.0</version>
+		<version>5.0</version>
 		<iconFile>resources/plugin.png</iconFile>
         <platform>all</platform>
 		<executionMode>command</executionMode>

[tuxdroid-svn] r6088 - software_suite_v3/software/plugin/plugin-facebook/tags

From: jerome <c2m...@c2...> - 2010-03-08 13:17:28

Author: jerome
Date: 2010-03-08 14:17:21 +0100 (Mon, 08 Mar 2010)
New Revision: 6088

Added:
   software_suite_v3/software/plugin/plugin-facebook/tags/4.0/
Log:
* Tagged 4.0

[tuxdroid-svn] r6087 - in software_suite_v3/software/plugin/plugin-facebook/trunk: . resources

From: jerome <c2m...@c2...> - 2010-03-08 13:17:14

Author: jerome
Date: 2010-03-08 14:16:58 +0100 (Mon, 08 Mar 2010)
New Revision: 6087

Modified:
   software_suite_v3/software/plugin/plugin-facebook/trunk/pom.xml
   software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml
Log:
* Version 4.0

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/pom.xml	2010-03-08 13:15:31 UTC (rev 6086)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/pom.xml	2010-03-08 13:16:58 UTC (rev 6087)
@@ -4,7 +4,7 @@
     <groupId>com.kysoh</groupId>
     <artifactId>plugin-facebook</artifactId>
     <packaging>jar</packaging>
-    <version>3.0</version>
+    <version>4.0</version>
     <name>Facebook plugin for Tux Droid</name>
     <url>http://www.tuxisalive.com</url>
     

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml	2010-03-08 13:15:31 UTC (rev 6086)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml	2010-03-08 13:16:58 UTC (rev 6087)
@@ -8,7 +8,7 @@
 		<name>Facebook Plugin</name>
 		<description>The Facebook plugin will notify you of any updates on your Facebook account.</description>
 		<author>Jerome Conan</author>
-		<version>3.0</version>
+		<version>4.0</version>
 		<iconFile>resources/plugin.png</iconFile>
         <platform>all</platform>
 		<executionMode>command</executionMode>

[tuxdroid-svn] r6086 - in software_suite_v3/software/plugin/plugin-facebook/trunk: . resources src/com/kysoh/plugins/facebook src/com/kysoh/plugins/facebook/configuration src/com/kysoh/plugins/facebook/connection

From: jerome <c2m...@c2...> - 2010-03-08 13:15:44

Author: jerome
Date: 2010-03-08 14:15:31 +0100 (Mon, 08 Mar 2010)
New Revision: 6086

Modified:
   software_suite_v3/software/plugin/plugin-facebook/trunk/
   software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml
   software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookConnection.java
   software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookFunctions.java
   software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookPlugin.java
   software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/configuration/FacebookDatasStruct.java
   software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java
   software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java
Log:
* Merged new_login branch.


Property changes on: software_suite_v3/software/plugin/plugin-facebook/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /software_suite_v3/software/plugin/plugin-facebook/branches/new_login:5889-6085

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml	2010-03-08 13:07:36 UTC (rev 6085)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/resources/plugin.xml	2010-03-08 13:15:31 UTC (rev 6086)
@@ -21,12 +21,6 @@
 			description="Login"
 			type="string"
 			defaultValue="your login" />
-        <parameter
-			category="Gadget parameters"
-			name="password"
-			description="Password"
-			type="password"
-			defaultValue="your password" />
 		<parameter
 			category="Gadget parameters"
 			name="notifyEmail"
@@ -70,7 +64,8 @@
 			description="Run to check your Facebook account" />
         <command
 			name="check"
-			description="Check your Facebook account" />
+			description="Check your Facebook account"
+		/>
         <command
 			name="configure"
 			description="Configure Tux Droid Facebook permissions" />

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookConnection.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookConnection.java	2010-03-08 13:07:36 UTC (rev 6085)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookConnection.java	2010-03-08 13:15:31 UTC (rev 6086)
@@ -38,7 +38,7 @@
 	/**
 	 * Try to get connected to fb with the old registered session.
 	 */
-	private boolean connectOldSession(String username, String password)
+	private boolean connectOldSession(String username)
 	{
 		try 
 		{
@@ -47,11 +47,7 @@
 			//Checking username.
 			if(! username.equalsIgnoreCase(FacebookSessionUtils.getMail()))
 			{
-				if(! password.equalsIgnoreCase(FacebookSessionUtils.getPass()))
-				{
-					//then a new user has logged in.
-					return false;
-				}
+				return false;
 			}
 			
 			String sessionKey = FacebookSessionUtils.getSessionKey();
@@ -75,32 +71,37 @@
 	
 	
 	
-	public boolean Connect(String username, String password) throws FacebookLoginException
+	public boolean Connect(String username) throws FacebookLoginException
 	{
+		//Checking for unique Facebook login process stuff.
+		if(! FacebookSessionUtils.isSingletonProgram("FacebookConnectFrame"))
+		{
+			return false;
+		}
+		
 		FacebookSessionUtils.setMail(username);
-		FacebookSessionUtils.setPass(password);
 		
 		//Facebook connection stuff.
 		
 		try 
 		{
 			//Returning if old session was still valid.
-			if(this.connectOldSession(username, password))
+			if(this.connectOldSession(username))
 			{
 				return true;
 			}
 			
 			FacebookSessionUtils.loadSession();
 			String sessionKey = FacebookSessionUtils.getValidSessionID( true );
-			FacebookSessionUtils.registerSessionKey(sessionKey);
+			FacebookSessionUtils.registerSessionKey();
 			
 			//Generate session secret, ready to pass to desktop app client
-			String sessionSecret = FacebookSessionUtils.lastClientUsed.getCacheSessionSecret();
-			FacebookSessionUtils.registerSessionSecret(sessionSecret);
+			String sessionSecret = FacebookSessionUtils.getSessionSecret();
+			FacebookSessionUtils.registerSessionSecret();
 			
 			client =  new FacebookJsonRestClient(FacebookSessionUtils.api_key, sessionSecret, sessionKey);
 			
-			if((sessionSecret == null) || (client == null))
+			if((sessionSecret.equals("0")) || (client.equals(null)))
 			{
 				return false;
 			}
@@ -111,6 +112,7 @@
 		} 
 		catch (FacebookException e) 
 		{
+			e.printStackTrace();
 			if(e.getMessage().equalsIgnoreCase("invalid parameter"))
 			{
 				throw new FacebookLoginException();
@@ -118,7 +120,7 @@
 		} 
 		catch (IOException e) 
 		{
-			//e.printStackTrace();
+			;
 		}
 		
 		return false;

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookFunctions.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookFunctions.java	2010-03-08 13:07:36 UTC (rev 6085)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookFunctions.java	2010-03-08 13:15:31 UTC (rev 6086)
@@ -100,7 +100,7 @@
 			JSONObject messages = (JSONObject) notifications.get("messages");
 			return messages.getInt("unread");
 		} 
-		catch (JSONException e) 
+		catch (Exception e) 
 		{
 			;
 		}

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookPlugin.java	2010-03-08 13:07:36 UTC (rev 6085)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/FacebookPlugin.java	2010-03-08 13:15:31 UTC (rev 6086)
@@ -42,6 +42,8 @@
 	private FacebookFunctions functions;
 	private FacebookDatasStruct facebookHistory;
 	
+	private String type = null;
+	
 	/**
 	 * Throws the result in case of Check mode.
 	 */
@@ -67,7 +69,7 @@
 		if (this.getCommand().equalsIgnoreCase("configure"))
 		{
 			FacebookConnection facebook = new FacebookConnection();
-			if ( facebook.Connect(this.configuration().getLogin(), this.configuration().getPassword()) )
+			if ( facebook.Connect(this.configuration().getLogin()) )
 			{
 				functions = new FacebookFunctions(facebook.getClient());
 				this.doConfigure(functions);
@@ -99,12 +101,12 @@
 	public void RunOrCheck()
 	{
 		FacebookConnection facebook = new FacebookConnection();
-		
+		type = this.getCommand().toUpperCase();
 		boolean connected = false;
 		
 		try 
 		{
-			connected = facebook.Connect(this.configuration().getLogin(), this.configuration().getPassword());
+			connected = facebook.Connect(this.configuration().getLogin());
 		} 
 		catch (FacebookLoginException e) 
 		{
@@ -274,10 +276,18 @@
 		    for(String request : f_requests)
 			{
 		    	String fid = functions.getFriendRequestID(request);
-		    	if(! facebookHistory.isRegistered(FacebookDatasStruct.FRIENDS_QUERIES, fid))
+		    	if(! facebookHistory.isRegistered(FacebookDatasStruct.FRIENDS_QUERIES, fid, type))
 		    	{
 		    		throwRes();
-		    		this.facebookHistory.addFriendRequest(fid);
+		    		if(this.getCommand().equalsIgnoreCase("check"))
+		        	{
+		    			this.facebookHistory.addFriendRequest(fid, "CHECK");
+		        	}
+		    		else
+		    		{
+		    			this.facebookHistory.addFriendRequest(fid, "CHECK");
+		    			this.facebookHistory.addFriendRequest(fid, "RUN");
+		    		}
 		    		//Only throwing in the second cycle of check command or run.
 		    		if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
 					{
@@ -319,10 +329,18 @@
 		    for(String group : g_invites)
 			{
 		    	String gid = functions.getGroupID(group);
-		    	if(! facebookHistory.isRegistered(FacebookDatasStruct.GROUP_INVITES, gid))
+		    	if(! facebookHistory.isRegistered(FacebookDatasStruct.GROUP_INVITES, gid, type))
 				{
 		    	    throwRes();
-		    	    this.facebookHistory.addGroupInvite(gid);
+		    	    if(this.getCommand().equalsIgnoreCase("check"))
+		        	{
+		    	    	this.facebookHistory.addGroupInvite(gid, "CHECK");
+		        	}
+		    	    else
+		    	    {
+		    	    	this.facebookHistory.addGroupInvite(gid, "CHECK");
+		    	    	this.facebookHistory.addGroupInvite(gid, "RUN");
+		    	    }
 		    	    //Only throwing in the second cycle of check command or run.
 		    		if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
 					{
@@ -363,10 +381,18 @@
 		    for(String event : e_invites)
 			{
 		    	String eid = functions.getEventID( event );
-		    	if(! facebookHistory.isRegistered(FacebookDatasStruct.EVENT_INVITE, eid))
+		    	if(! facebookHistory.isRegistered(FacebookDatasStruct.EVENT_INVITE, eid, type))
 				{
 		    		throwRes();
-		    	    this.facebookHistory.addEventInvite(functions.getEventID(event));
+		    		if(this.getCommand().equalsIgnoreCase("check"))
+		        	{
+		    			this.facebookHistory.addEventInvite(functions.getEventID(event), "CHECK");
+		        	}
+		    		else
+		    		{
+		    			this.facebookHistory.addEventInvite(functions.getEventID(event), "CHECK");
+		    			this.facebookHistory.addEventInvite(functions.getEventID(event), "RUN");
+		    		}
 		    	    //Only throwing in the second cycle of check command or run.
 		    		if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
 					{

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/configuration/FacebookDatasStruct.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/configuration/FacebookDatasStruct.java	2010-03-08 13:07:36 UTC (rev 6085)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/configuration/FacebookDatasStruct.java	2010-03-08 13:15:31 UTC (rev 6086)
@@ -148,27 +148,27 @@
 	/**
 	 * Add a reply to the reply hash table.
 	 */
-	public void addEventInvite(String event_id)
+	public void addEventInvite(String event_id, String type)
 	{
-		this.vktStruct.add(new String("eid:" + event_id));
+		this.vktStruct.add(new String("eid:" + event_id + "_" + type));
 	}
 	
 	
 	/**
 	 * Add a status for selected friend.
 	 */
-	public void addFriendRequest(String request_id)
+	public void addFriendRequest(String request_id, String type)
 	{
-		this.vktStruct.add(new String("fid:" + request_id));
+		this.vktStruct.add(new String("fid:" + request_id + "_" + type));
 	}
 	
 	
 	/**
 	 * Add a status for selected friend.
 	 */
-	public void addGroupInvite(String group_id)
+	public void addGroupInvite(String group_id, String type)
 	{
-		this.vktStruct.add(new String("gid:" + group_id));
+		this.vktStruct.add(new String("gid:" + group_id + "_" + type));
 	}
 	
 	
@@ -187,22 +187,46 @@
 	 * @param uuid.
 	 * @return
 	 */
-	public boolean isRegistered(byte list, String id)
+	public boolean isRegistered(byte list, String id, String type)
 	{
 		
 		switch(list)
 		{
 			case FacebookDatasStruct.FRIENDS_QUERIES:
-				return vktStruct.contains("fid:" + id);
+				if (type == "CHECK")
+				{
+					return ( vktStruct.contains("fid:" + id + "_" + "CHECK") ||
+							 vktStruct.contains("fid:" + id + "_" + "RUN"));
+				}
+				else
+				{
+					return vktStruct.contains("fid:" + id + "_" + type);
+				}
 			
 			case FacebookDatasStruct.MESSAGES:
 			    return vktStruct.contains("mes:" + id);
 				
 			case FacebookDatasStruct.GROUP_INVITES:
-			    return vktStruct.contains("gid:" + id);
+				if (type == "CHECK")
+				{
+					return (vktStruct.contains("gid:" + id+ "_" + "CHECK") ||
+					        vktStruct.contains("gid:" + id+ "_" + "RUN"));
+				}
+				else
+				{
+					return vktStruct.contains("gid:" + id+ "_" + type);
+				}
 			
 			case FacebookDatasStruct.EVENT_INVITE:
-			    return vktStruct.contains("eid:" + id);
+				if (type == "CHECK")
+				{
+					return (vktStruct.contains("eid:" + id+ "_" + "CHECK") ||
+							vktStruct.contains("eid:" + id+ "_" + "RUN"));
+				}
+				else
+				{
+					return vktStruct.contains("eid:" + id+ "_" + type);
+				}
 			
 			default:
 				return false;

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java	2010-03-08 13:07:36 UTC (rev 6085)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java	2010-03-08 13:15:31 UTC (rev 6086)
@@ -27,7 +27,6 @@
 public class PluginFacebookConfiguration extends SimplePluginConfiguration{
 		
 	private String login = "";
-	private String password = "";
 	
 	private boolean showFriendRequests = true;
 	private boolean showGroupsInvites = true;
@@ -99,26 +98,6 @@
 	
 	
 	/**
-	 * Return tthe user password.
-	 * @return
-	 */
-	public String getPassword()
-	{
-		return this.password;
-	}
-	
-	
-	/**
-	 * Set the user password.
-	 * @param aPassword
-	 */
-	public void setPassword(String aPassword)
-	{
-		this.password = aPassword;
-	}
-	
-	
-	/**
 	 * Return true if user want to hear his email notifications.
 	 * @return
 	 */

Modified: software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java	2010-03-08 13:07:36 UTC (rev 6085)
+++ software_suite_v3/software/plugin/plugin-facebook/trunk/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java	2010-03-08 13:15:31 UTC (rev 6086)
@@ -22,7 +22,7 @@
 
 package com.kysoh.plugins.facebook.connection;
 
-
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -30,10 +30,22 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
 import java.util.Vector;
 
+import javax.swing.ImageIcon;
+import javax.swing.JFrame;
+
+import org.lobobrowser.gui.FramePanel;
+import org.lobobrowser.main.PlatformInit;
+import org.lobobrowser.ua.NavigationEvent;
+import org.lobobrowser.ua.NavigationListener;
+import org.lobobrowser.ua.NavigationVetoException;
+
 import com.google.code.facebookapi.FacebookException;
 import com.google.code.facebookapi.FacebookXmlRestClient;
+import com.kysoh.plugins.facebook.FacebookPlugin;
 
 public class FacebookSessionUtils {
 	
@@ -41,21 +53,26 @@
 	public static String s_key   = "0314c8569f89d0411e5a4823372ae27a";
 	
 	protected static String mail = "";
-	protected static String pass = "";
 	
 	public static String lastTokenUsed;
 	public static FacebookXmlRestClient lastClientUsed;
 	
 	
 	private static SerializedVector sessionUtils = new SerializedVector();
+	
+	static boolean loggedIn = false;
+	static String session_key = null;
+	static String session_secret = null;
+	static JFrame frame;
+	static boolean waitFor = true;
 
+	private static File lockFile = null; 
 	
 	static
 	{
 		sessionUtils.add("0");
 		sessionUtils.add("1");
 		sessionUtils.add(mail);
-		sessionUtils.add(pass);
 	}
 	
 	public static void setMail(String eMail)
@@ -65,13 +82,6 @@
 	}
 	
 	
-	public static void setPass(String aPass)
-	{
-		pass = aPass;
-		sessionUtils.add(aPass);
-	}
-	
-	
 	public static String getValidSessionID( boolean generateSessionSecret) 
 	              throws IOException, FacebookException {
 		
@@ -79,11 +89,148 @@
 		FacebookXmlRestClient client = new FacebookXmlRestClient( api_key, s_key );
 		String token = client.auth_createToken();
         
-        
+		String url = "http://www.facebook.com/login.php?api_key="+ api_key + "&connect_display=popup&v=1.0"+
+        "&next=http://www.facebook.com/connect/login_success.html" +
+        "&cancel_url=http://www.facebook.com/connect/login_failure.html&"+
+        "fbconnect=true&return_session=true&session_key_only=true&email=" + mail;
 
+
+		//Creating lobo browser panel.
+		try 
+		{
+		    PlatformInit.getInstance().initLogging(false);
+		    PlatformInit.getInstance().init(false, false);
+		} 
+		catch (Exception e2) {
+		;
+		}
+		
+		frame = new JFrame();
+		frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+		frame.setSize(600, 400);
+		frame.setLocationRelativeTo(null);
+		
+		frame.setTitle("Facebook Connect ( Tux Droid )");
+		
+		FramePanel browser = new FramePanel();
+		
+		frame.getContentPane().add(browser);
+		
+		frame.setVisible(true);
+		frame.setAlwaysOnTop( true );
+		String loc = FacebookPlugin.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+		loc = loc.substring(0, loc.lastIndexOf("/"));
+		File f = new File(loc + "/../resources/plugin.png");
+		ImageIcon img = new ImageIcon(f.getAbsolutePath());
+		frame.setIconImage(img.getImage());
+		
+		try 
+		{
+		browser.navigate(url);
+		} 
+		catch (MalformedURLException e1) 
+		{
+		;
+		}
+		
+		// Add a navigation listener.
+		browser.addNavigationListener(new NavigationListener()
+		{
+		
+		@Override
+		public void beforeLocalNavigate(NavigationEvent arg0) throws NavigationVetoException 
+		{
+			//login success ( login fail in all other cases ).
+			if(arg0.getURL().toString().contains("login_success.html"))
+			{
+				//System.out.println(arg0.getURL().toString());
+				//Getting session key.
+				if(arg0.getURL().toString().contains("session_key"))
+				{
+					loggedIn = true;
+					int bIdx = arg0.getURL().toString().indexOf("session_key");
+					session_key = arg0.getURL().toString().substring(bIdx);
+					
+					try 
+					{
+						//Re-encoding url.
+						session_key = java.net.URLDecoder.decode(session_key, "UTF-8");
+					} 
+					catch (UnsupportedEncodingException e) 
+					{
+						loggedIn = false;
+					}
+					String[] params = session_key.split(",");
+					
+					for (String str : params )
+					{
+						if (str.contains("session_key"))
+						{
+							session_key = str.substring("session_key".length() + 3);
+							session_key = session_key.substring(0, session_key.length() - 1);
+						}
+						
+						if(str.contains("secret"))
+						{
+							session_secret = str.substring("secret".length() + 4);
+							session_secret = session_secret.substring(0, session_secret.length() - 1);
+							frame.dispose();
+							waitFor = false;
+						}
+					} 
+				}
+				else
+				{
+					loggedIn = false;
+				}
+			}
+		}
+		
+		@Override
+		public void beforeNavigate(NavigationEvent arg0) throws NavigationVetoException {
+			;
+		}
+		
+		@Override
+		public void beforeWindowOpen(NavigationEvent arg0) throws NavigationVetoException {
+			;
+		}
+		
+		});
+		
+		
+		frame.addWindowListener(new java.awt.event.WindowAdapter() 
+		{
+		public void windowClosing(WindowEvent e)
+		{
+			waitFor = false;
+		}
+		});
+		
+		//Wait for navigator.
+		while(waitFor)
+		{
+		try 
+		{
+			Thread.sleep(1000);
+		} 
+		catch (InterruptedException e) 
+		{
+			;
+		}
+		}
+
 		lastTokenUsed = token;
 		lastClientUsed = client;
-		return "";
+		registerSessionSecret();
+		registerSessionKey();
+		
+		if(FacebookSessionUtils.lockFile.exists())
+		{
+			FacebookSessionUtils.lockFile.delete();
+		}
+		
+		return session_key;
 	}
 	
 	
@@ -91,9 +238,9 @@
 	 * Register the last known session secret.
 	 * @param aSessionSecret
 	 */
-	public static void registerSessionSecret(String aSessionSecret)
+	public static void registerSessionSecret()
 	{
-		sessionUtils.set(0, new String(aSessionSecret));
+		sessionUtils.set(0, new String(session_secret));
 	}
 	
 	
@@ -119,22 +266,12 @@
 	
 	
 	/**
-	 * Return last used pass.
-	 * @return
-	 */
-	public static String getPass()
-	{
-		return (String) sessionUtils.get( 3 );
-	}
-	
-	
-	/**
 	 * Register the last known session key.
 	 * @param aSessionKey
 	 */
-	public static void registerSessionKey(String aSessionKey)
+	public static void registerSessionKey()
 	{
-		sessionUtils.set(1, new String(aSessionKey));
+		sessionUtils.set(1, new String(session_key));
 	}
 	
 	
@@ -144,6 +281,11 @@
 	 */
 	public static String getSessionKey()
 	{
+		if (sessionUtils.get(1) != null)
+		{
+			session_key = sessionUtils.get(1);
+		}
+		
 		return (String) sessionUtils.get( 1 );
 	}
 	
@@ -152,16 +294,15 @@
 	/**
 	 * Load the serialized vector containing old session datas.
 	 */
-	public static void loadSession()
+	public static boolean loadSession()
 	{
 		try 
 		{   
-			File path = new File("");
-		    File session = new File( path.getAbsolutePath() + File.separator + "session_" + mail);
+		    File session = new File( getCachePath() );
 		    
 		    if(session.isFile())
 		    {
-		    	FileInputStream fichier = new FileInputStream("session_" + mail);  
+		    	FileInputStream fichier = new FileInputStream(session.getAbsolutePath());  
 		    	ObjectInputStream ois = new ObjectInputStream(fichier);
 		    	sessionUtils = (SerializedVector) ois.readObject();  
 		    }
@@ -171,7 +312,7 @@
 		    	sessionUtils.add("0");
 		    	sessionUtils.add("0");
 		    	sessionUtils.add(mail);
-		    	sessionUtils.add(pass);
+		    	return false;
 		    }
 		 }   
 		 catch (java.io.IOException e) 
@@ -182,6 +323,7 @@
 		 {  
 		      e.printStackTrace();  
 		 }  
+		 return true;
 	}
 	
 	
@@ -198,8 +340,7 @@
 		
 		try 
 		{  
-			File path = new File("");
-		    File session = new File( path.getAbsolutePath() + File.separator + "session_" + mail);
+		    File session = new File( getCachePath() );
 		    FileOutputStream file = new FileOutputStream(session.getAbsolutePath());  
 		    ObjectOutputStream oos = new ObjectOutputStream(file);  
 		    oos.writeObject(sessionUtils);  
@@ -212,6 +353,13 @@
 		 }  
 	}
 	
+	
+	public static String getCachePath()
+	{
+		File f = new File(System.getProperty("java.io.tmpdir") + "/session_" + mail);
+		return f.getAbsolutePath();
+	}
+	
 	/**
 	 * Handle a serialized vector of vector<String>
 	 */
@@ -226,4 +374,29 @@
 		}
 		
 	}
+	
+	
+	public static synchronized Boolean isSingletonProgram(String name)
+	{
+        Boolean statut = true;
+        String tmpdir = System.getProperty("java.io.tmpdir");
+        
+        File temporaryFile = new File(tmpdir + "/" + name +".tmp");
+        statut = !temporaryFile.exists();
+        
+        if(statut){
+            try 
+            {
+				temporaryFile.createNewFile();
+				temporaryFile.deleteOnExit();
+				FacebookSessionUtils.lockFile = temporaryFile;
+			} catch (IOException e) 
+			{
+				statut = true;
+			}
+        }
+        
+        return statut;
+    }
+
 }

[tuxdroid-svn] r6085 - software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/tags

From: jerome <c2m...@c2...> - 2010-03-08 13:07:43

Author: jerome
Date: 2010-03-08 14:07:36 +0100 (Mon, 08 Mar 2010)
New Revision: 6085

Added:
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/tags/0.1/
Log:
* Tagged 0.1

[tuxdroid-svn] r6084 - in software_suite_v3/software/plugin/plugins-demo: . cpp-HelloWorld-plugin cpp-HelloWorld-plugin/trunk cpp-HelloWorld-plugin/trunk/builder cpp-HelloWorld-plugin/trunk/builder/util cpp-HelloWorld-plugin/trunk/builder/util/misc cpp-HelloWorld-plugin/trunk/executables cpp-HelloWorld-plugin/trunk/resources

From: jerome <c2m...@c2...> - 2010-03-08 13:07:36

Author: jerome
Date: 2010-03-08 14:07:15 +0100 (Mon, 08 Mar 2010)
New Revision: 6084

Added:
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/branches/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/tags/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/LICENSE
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/build.py
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/PluginPackager.py
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/__init__.py
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/__init__.py
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/DirectoriesAndFilesTools.py
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/__init__.py
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/version.py
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/version.py
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/HelloWorld.dev
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/HelloWorld.exe
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/main.cpp
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/start.py
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/HelloWorld.png
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/help.wiki
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.pot
   software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.xml
Log:
* Added cpp hello world.

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/LICENSE
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/LICENSE	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/LICENSE	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/build.py
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/build.py	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/build.py	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+#    Copyleft (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
+
+from builder.PluginPackager import PluginPackager
+
+if __name__ == "__main__":
+    PluginPackager().createScp("plugin-HelloWorld.scp")

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/PluginPackager.py
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/PluginPackager.py	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/PluginPackager.py	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+
+import version
+__author__ = version.author
+__date__ = version.date
+__version__ = version.version
+__licence__ = version.licence
+del version
+
+#    Copyleft (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 os
+from zipfile import *
+
+from util.misc.DirectoriesAndFilesTools import *
+
+# ------------------------------------------------------------------------------
+# Class to create a SCP file from the main directory of a python plugin project.
+# ------------------------------------------------------------------------------
+class PluginPackager(object):
+    """Class to create a SCP file from the main directory of a python plugin
+    project.
+    """
+
+    # --------------------------------------------------------------------------
+    # Create a scp file.
+    # --------------------------------------------------------------------------
+    def createScp(self, scpFileName):
+        """Create a scp file.
+        @param scpFileName: Smart-Core Plugin file name.
+        @return: The success of the file creation.
+        """
+        self.__sourcePath = os.path.realpath("")
+        if not os.path.isdir(self.__sourcePath):
+            return False
+        if not os.path.isdir(os.path.join(self.__sourcePath, "executables")):
+            return False
+        if not os.path.isdir(os.path.join(self.__sourcePath, "resources")):
+            return False
+        # Get some paths
+        SRC_EXECUTABLES_PATH = os.path.join(self.__sourcePath, "executables")
+        SRC_RESOURCES_PATH = os.path.join(self.__sourcePath, "resources")
+        TMP_BUILD_PATH = os.path.join(self.__sourcePath, "tmp")
+        DEST_EXECUTABLES_PATH = os.path.join(TMP_BUILD_PATH, "executables")
+        DEST_RESOURCES_PATH = os.path.join(TMP_BUILD_PATH, "resources")
+        DEST_SCP_FILENAME = os.path.join(self.__sourcePath, scpFileName)
+        # Create the temporary build path
+        MKDirsF(TMP_BUILD_PATH)
+        # Copy "executables" directory
+        CPDir(SRC_EXECUTABLES_PATH, DEST_EXECUTABLES_PATH)
+        # Copy "resources" directory
+        CPDir(SRC_RESOURCES_PATH, DEST_RESOURCES_PATH)
+        # Filtering the content of temporary path
+        RMWithFilters(TMP_BUILD_PATH, filters = ['.svn', '.pyc'])
+        # Create a zip file
+        directory = TMP_BUILD_PATH
+        last_cwd = os.getcwd()
+        os.chdir(TMP_BUILD_PATH)
+        zf = ZipFile(DEST_SCP_FILENAME, 'w', compression = ZIP_DEFLATED)
+        def walker(zip, directory, files, root = directory):
+            for file in files:
+                file = os.path.join(directory, file)
+                name = file[len(TMP_BUILD_PATH) + 1:]
+                if os.path.isfile(file):
+                    zip.write(file, name, ZIP_DEFLATED)
+                elif os.path.isdir(file):
+                    file = os.path.join(file, "")
+                    name = os.path.join(name, "")
+                    zip.writestr(name, name)
+        os.path.walk(TMP_BUILD_PATH, walker, zf)
+        zf.close()
+        os.chdir(os.path.abspath(last_cwd))
+        # Remove the temporary directory
+        RMDirs(TMP_BUILD_PATH)
+        return True

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/DirectoriesAndFilesTools.py
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/DirectoriesAndFilesTools.py	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/DirectoriesAndFilesTools.py	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,161 @@
+# -*- coding: utf-8 -*-
+
+import version
+__author__ = version.author
+__date__ = version.date
+__version__ = version.version
+__licence__ = version.licence
+del version
+
+#    Copyleft (C) 2008 Acness World
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+import os
+import shutil
+
+if os.name == 'nt':
+    import win32con
+    import win32file
+
+# ==============================================================================
+# Public functions
+# ==============================================================================
+
+# ------------------------------------------------------------------------------
+# Force to create a directories tree if not exists.
+# ------------------------------------------------------------------------------
+def MKDirs(path):
+    """Force to create a directories tree if not exists.
+    @param path: Directory path.
+    """
+    if not os.path.isdir(path):
+        try:
+            os.makedirs(path)
+        except:
+            pass
+
+# ------------------------------------------------------------------------------
+# Force to create a directories tree after having deleted the old one.
+# ------------------------------------------------------------------------------
+def MKDirsF(path):
+    """Force to create a directories tree after having deleted the old one.
+    @param path: Directory path.
+    """
+    if os.path.isdir(path):
+        RMDirs(path)
+    os.makedirs(path)
+
+# ------------------------------------------------------------------------------
+# Remove directories and files recursively.
+# ------------------------------------------------------------------------------
+def RMDirs(path):
+    """Remove directories and files recursively.
+    @param path: Path of the base directory.
+    """
+    if not os.path.isdir(path):
+        return
+    for root, dirs, files in os.walk(path, topdown = False):
+        for d in dirs:
+            try:
+                os.removedirs(os.path.join(root, d))
+            except:
+                pass
+        for f in files:
+            try:
+                if os.name == 'nt':
+                    win32file.SetFileAttributesW(os.path.join(root, f),
+                        win32con.FILE_ATTRIBUTE_NORMAL)
+                os.remove(os.path.join(root, f))
+            except:
+                pass
+    if os.path.isdir(path):
+        try:
+            os.removedirs(path)
+        except:
+            pass
+
+# ------------------------------------------------------------------------------
+# Remove directories and files recursively with filters.
+# ------------------------------------------------------------------------------
+def RMWithFilters(path, filters = ['.pyc', '.pyo']):
+    """Remove directories and files recursively with filters.
+    @param path: Path of the base directory.
+    @param filters: Filters as list.
+    """
+    def checkFilter(name):
+        for filter in filters:
+            if name.lower().find(filter.lower()) == (len(name) - len(filter)):
+                return True
+        return False
+
+    if not os.path.isdir(path):
+        return
+
+    for root, dirs, files in os.walk(path, topdown = False):
+        for d in dirs:
+            if checkFilter(os.path.join(root, d)):
+                try:
+                    RMDirs(os.path.join(root, d))
+                except:
+                    pass
+        for f in files:
+            if checkFilter(os.path.join(root, f)):
+                try:
+                    if os.name == 'nt':
+                        win32file.SetFileAttributesW(os.path.join(root, f),
+                            win32con.FILE_ATTRIBUTE_NORMAL)
+                    os.remove(os.path.join(root, f))
+                except:
+                    pass
+
+# ------------------------------------------------------------------------------
+# Remove a file.
+# ------------------------------------------------------------------------------
+def RMFile(path):
+    """Remove a file.
+    @param path: File path.
+    """
+    if os.path.isfile(path):
+        try:
+            if os.name == 'nt':
+                win32file.SetFileAttributesW(path,
+                    win32con.FILE_ATTRIBUTE_NORMAL)
+            os.remove(path)
+        except:
+            pass
+
+# ------------------------------------------------------------------------------
+# Copy a directories tree to another directory.
+# ------------------------------------------------------------------------------
+def CPDir(src, dest):
+    """Copy a directories tree to another directory.
+    @param src: Source path.
+    @param dest: Destination path.
+    """
+    if not os.path.isdir(src):
+        return
+    if os.path.isdir(dest):
+        RMDirs(dest)
+    shutil.copytree(src, dest)
+
+# ------------------------------------------------------------------------------
+# Retrieve the OS temporary directory.
+# ------------------------------------------------------------------------------
+def GetOSTMPDir():
+    """Retrieve the OS temporary directory.
+    @return: The OS temporary directory.
+    """
+    result = None
+    # On Windows
+    if os.name == 'nt':
+        result = os.environ.get('tmp')
+        if result == None:
+            result = os.environ.get('temp')
+            if result == None:
+                result = "c:\\windows\\temp"
+    # On linux
+    else:
+        result = "/tmp"
+    return result

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/version.py
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/version.py	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/util/misc/version.py	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+"""Version data for tuxisalive.lib.Util"""
+
+__author__ = "Remi Jocaille (rem...@c2...)"
+
+#    Copyleft (C) 2008 C2ME Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+name = 'util.misc'
+version = '0.0.1'
+author = "Remi Jocaille (rem...@c2...)"
+
+description = "Utilities libraries."
+
+licence = "GPL"
+date = "December 2008"

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/version.py
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/version.py	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/builder/version.py	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,9 @@
+#    Copyleft (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
+
+version = '0.0.2'
+author = "Remi Jocaille (rem...@c2...)"
+licence = "GPL"
+date = "2009"

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/HelloWorld.dev
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/HelloWorld.dev	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/HelloWorld.dev	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,59 @@
+[Project]
+FileName=HelloWorld.dev
+Name=Project1
+UnitCount=1
+Type=1
+Ver=1
+ObjFiles=
+Includes=
+Libs=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Compiler=
+CppCompiler=
+Linker=
+IsCpp=1
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=
+HostApplication=
+Folders=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=
+
+[Unit1]
+FileName=main.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=
+AutoIncBuildNr=0
+

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/HelloWorld.exe
===================================================================
(Binary files differ)


Property changes on: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/HelloWorld.exe
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/main.cpp
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/main.cpp	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/main.cpp	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,67 @@
+#include <cstdlib>
+#include <iostream>
+#include <string>
+
+using namespace std;
+
+void start(string command);
+void check();
+void run();
+
+int getCounter();
+string getMessage();
+
+//Starting the plugin.
+int main(int argc, char *argv[])
+{
+    start(argv[1]);
+    return EXIT_SUCCESS;
+}
+
+//Plugin main entry point.
+void start(string command="run")
+{
+  if(command != "check")
+  {
+    run();
+  }
+  else
+  {
+    check();
+  }
+}
+
+//Plugin 'run' command
+void run()
+{
+  unsigned short int count = getCounter();
+  
+  while(count > 0){
+    cout << "message '" << getMessage() << "'\n";
+    count --;
+  }
+
+}
+
+//Plugin 'check' command
+void check()
+{
+  unsigned short int count = getCounter();
+  
+  while(count > 0){
+    cout << "message '" << getMessage() << " in scheduler mode'\n";
+    count --;
+  }
+}
+
+//Return 'counter' plugin parameter
+int getCounter()
+{
+  return atoi(getenv("tgp_counter"));
+}
+
+//Return 'message' plugin parameter
+string getMessage()
+{
+  return getenv("tgp_message");
+}

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/start.py
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/start.py	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/executables/start.py	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright (C) 2009 Kysoh Sa
+#    kysoh
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+__author__  = "Kysoh"
+__appname__ = "Bash D"
+__version__ = "0.1"
+__date__    = "2010/03/04"
+__license__ = "GPL"
+
+import os
+import time
+import sys
+import threading
+
+sys.path.append(os.environ['TUXDROID_SERVER_PYTHON_UTIL'])
+
+from util.SimplePlugin.SimplePluginConfiguration import SimplePluginConfiguration
+from util.SimplePlugin.SimplePlugin import SimplePlugin
+
+class HelloWorldPlugin(SimplePlugin):
+    """This class override the SimplePlugin class to make easy
+    the plugin coding.
+    """
+
+    def __init__(self):
+        """Initialization of the class.
+        """
+        # Call the super class
+        SimplePlugin.__init__(self)
+
+    def start(self):
+        """Plugin entry point.
+        This method should be used to dispatch commands.
+        """
+        #Setting execute rights
+        if self.getCommand() == "run":
+            self.run()
+        else:
+            self.check()
+			
+    def check(self):
+        """
+        """
+        if os.name == "nt":
+            os.system("executables\\HelloWorld.exe check")
+        else:
+            os.system("executables//HelloWorld check")
+
+    def run(self):
+        """Plugin entry point for the "run" command.
+        """
+        if os.name == "nt":
+            os.system("executables\\HelloWorld.exe run")
+        else:
+            os.system("executables//HelloWorld run")
+
+    def onPluginStop(self):
+        """Callback on plugin stop.
+        """
+        pass
+
+    def onPluginEvent(self, eventName, eventValues):
+        """Callback on plugin event.
+        @param eventName: Event name.
+        @param eventValues: Event values.
+        """
+        pass
+
+if __name__ == "__main__":
+    plugin = HelloWorldPlugin()
+    plugin.boot(sys.argv[1:], SimplePluginConfiguration())

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/HelloWorld.png
===================================================================
(Binary files differ)


Property changes on: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/HelloWorld.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/help.wiki
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/help.wiki	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/help.wiki	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,2 @@
+== Synopsis ==
+C++ simple "Hello World" plugin.

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.pot	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.pot	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,20 @@
+msgid "Hello World C++ Sample Plugin"
+msgstr ""
+
+msgid "Hello world in scheduled mode"
+msgstr ""
+
+msgid "Message sent when I'm saying hello"
+msgstr ""
+
+msgid "Hello world in c++"
+msgstr ""
+
+msgid "How many time the message will be throwed"
+msgstr ""
+
+msgid "Run the plugin"
+msgstr ""
+
+msgid "Start check command for scheduled Hello world."
+msgstr ""

Added: software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.xml	                        (rev 0)
+++ software_suite_v3/software/plugin/plugins-demo/cpp-HelloWorld-plugin/trunk/resources/plugin.xml	2010-03-08 13:07:15 UTC (rev 6084)
@@ -0,0 +1,50 @@
+<plugin>
+	<interpreter
+		kind="python">
+		<executable>executables/start.py</executable>
+	</interpreter>
+	<description>
+		<name>Hello World C++ Sample Plugin</name>
+		<description>This plugin throws a simple Hello World notification in c++</description>
+		<author>jerome conan</author>
+		<version>0.1</version>
+		<iconFile>resources/HelloWorld.png</iconFile>
+		<executionMode>command</executionMode>
+		<!-- Plugin uuid -->
+		<uuid>548f7a9a-567c-4b3e-a0dd-102ca68a1b8a</uuid>
+	</description>
+	<parameters>
+	    <!-- String parameter example -->
+		<parameter
+			name="message"
+			description="Message sent when I'm saying hello"
+			type="string"
+			defaultValue="Hello world in cpp" />
+		<!-- Enumeration parameter example -->
+		<parameter
+			name="counter"
+			description="How many time the message will be throwed"
+			type="enum(1,2,3,4,5,6,7,8,9,10)"
+			defaultValue="1" />
+	</parameters>
+	<commands>
+	    <!-- Command used starting the plugin in run mode -->
+		<command name="run" description="Run the plugin"/>
+		<!-- Command used starting the plugin by scheduler -->
+		<command name="check" description="Start check command for scheduled Hello world."/>
+	</commands>
+	<tasks>
+	    <!-- start check mode every minute -->
+	    <task
+            name="My checker"
+            description="Start check function every minute"
+            command="check"
+            type="every x"
+            activated="false"      
+
+            delay="00:01:00"
+            delayMask="false,true,false"
+            delayVisible="true"
+        />
+	</tasks>
+</plugin>

[tuxdroid-svn] r6083 - in software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin: tags/0.1/executables trunk/executables

From: jerome <c2m...@c2...> - 2010-03-08 12:02:37

Author: jerome
Date: 2010-03-08 13:02:21 +0100 (Mon, 08 Mar 2010)
New Revision: 6083

Modified:
   software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/tags/0.1/executables/start.py
   software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/executables/start.py
Log:
* Fixed command ( oups )

Modified: software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/tags/0.1/executables/start.py
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/tags/0.1/executables/start.py	2010-03-08 11:10:56 UTC (rev 6082)
+++ software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/tags/0.1/executables/start.py	2010-03-08 12:02:21 UTC (rev 6083)
@@ -47,7 +47,7 @@
         """
         """
         if os.name != "nt":
-            os.system("perl executables//bashHelloWorld.sh check")
+            os.system("executables//bashHelloWorld.sh check")
         else:
             self.throwMessage("No matching platform")
 

Modified: software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/executables/start.py
===================================================================
--- software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/executables/start.py	2010-03-08 11:10:56 UTC (rev 6082)
+++ software_suite_v3/software/plugin/plugins-demo/bash-HelloWorld-plugin/trunk/executables/start.py	2010-03-08 12:02:21 UTC (rev 6083)
@@ -47,7 +47,7 @@
         """
         """
         if os.name != "nt":
-            os.system("perl executables//bashHelloWorld.sh check")
+            os.system("executables//bashHelloWorld.sh check")
         else:
             self.throwMessage("No matching platform")

1 message has been excluded from this view by a project administrator.

Flat | Threaded

1 2 3 .. 237 > >> (Page 1 of 237)

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