tux-droid-svn Mailing List for Tux Droid CE (Page 25)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: remi <c2m...@c2...> - 2009-09-17 09:20:52
|
Author: remi
Date: 2009-09-17 11:20:42 +0200 (Thu, 17 Sep 2009)
New Revision: 5430
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/attitunes.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
Log:
* Fixed gfx bug with "delete" button
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/attitunes.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/attitunes.xsl 2009-09-17 09:15:43 UTC (rev 5429)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/attitunes.xsl 2009-09-17 09:20:42 UTC (rev 5430)
@@ -230,13 +230,13 @@
function disableEditAttituneButtons(name)
{
document.getElementById("editId_" + name).className = "attitunesBtnNoTitle attitunesBtnEditDisable";
- document.getElementById("deleteId_" + name).className = "attitunesBtnTitle attitunesBtnDeleteDisable";
+ document.getElementById("deleteId_" + name).className = "attitunesBtnNoTitle attitunesBtnDeleteDisable";
}
function enableEditAttituneButtons(name)
{
document.getElementById("editId_" + name).className = "attitunesBtnNoTitle attitunesBtnEdit";
- document.getElementById("deleteId_" + name).className = "attitunesBtnTitle attitunesBtnDelete";
+ document.getElementById("deleteId_" + name).className = "attitunesBtnNoTitle attitunesBtnDelete";
}
function thisAttituneIsPlaying(name)
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-09-17 09:15:43 UTC (rev 5429)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-09-17 09:20:42 UTC (rev 5430)
@@ -303,7 +303,7 @@
document.getElementById("helpId_" + uuid).className = "gadgetsBtnNoTitle gadgetsBtnHelpDisable";
document.getElementById("configureId_" + uuid).className = "gadgetsBtnNoTitle gadgetsBtnConfigureDisable";
document.getElementById("duplicateId_" + uuid).className = "gadgetsBtnNoTitle gadgetsBtnDuplicateDisable";
- document.getElementById("deleteId_" + uuid).className = "gadgetsBtnTitle gadgetsBtnDeleteDisable";
+ document.getElementById("deleteId_" + uuid).className = "gadgetsBtnNoTitle gadgetsBtnDeleteDisable";
}
function enableEditGadgetButtons(uuid)
@@ -311,7 +311,7 @@
document.getElementById("helpId_" + uuid).className = "gadgetsBtnNoTitle gadgetsBtnHelp";
document.getElementById("configureId_" + uuid).className = "gadgetsBtnNoTitle gadgetsBtnConfigure";
document.getElementById("duplicateId_" + uuid).className = "gadgetsBtnNoTitle gadgetsBtnDuplicate";
- document.getElementById("deleteId_" + uuid).className = "gadgetsBtnTitle gadgetsBtnDelete";
+ document.getElementById("deleteId_" + uuid).className = "gadgetsBtnNoTitle gadgetsBtnDelete";
}
function thisGadgetIsPlaying(uuid)
|
|
From: jerome <c2m...@c2...> - 2009-09-17 09:15:50
|
Author: jerome Date: 2009-09-17 11:15:43 +0200 (Thu, 17 Sep 2009) New Revision: 5429 Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/de/test_attitune.att Log: . De attitune is now played with Klaus. Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/de/test_attitune.att =================================================================== (Binary files differ) |
|
From: jerome <c2m...@c2...> - 2009-09-17 08:58:33
|
Author: jerome Date: 2009-09-17 10:58:18 +0200 (Thu, 17 Sep 2009) New Revision: 5428 Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/times.is2 Log: * Updated de attitune time. Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/times.is2 =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/times.is2 2009-09-17 08:57:19 UTC (rev 5427) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/times.is2 2009-09-17 08:58:18 UTC (rev 5428) @@ -1,3 +1,4 @@ en=10 fr=10 -nl=11 \ No newline at end of file +nl=11 +de=10 \ No newline at end of file |
|
From: jerome <c2m...@c2...> - 2009-09-17 08:57:34
|
Author: jerome
Date: 2009-09-17 10:57:19 +0200 (Thu, 17 Sep 2009)
New Revision: 5427
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Removed unused var.
* Trying to start the server two times.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-17 08:43:55 UTC (rev 5426)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-17 08:57:19 UTC (rev 5427)
@@ -202,6 +202,7 @@
procedure setImage(Btn : TImage; ImageLocation : string);
procedure ShowSplashScreen();
procedure HideSplashScreen();
+ procedure startWithSplash();
public
{ Darations publiques }
end;
@@ -212,7 +213,6 @@
BoxOk1 : TForm3;
values : TStringList;
testCount : byte;
- hardwareTestCount : byte;
implementation
@@ -258,7 +258,6 @@
LabelSendReport.Caption := gettext(END_SEND_REPORT);
testCount := 1;
- hardwareTestCount := 1;
TuxUtils.initKnowedVars();
@@ -304,14 +303,24 @@
NextLabel.OnMouseUp := Form1.NextMouseUp;
end;
-
-//Start smart core and display splashscreen.
-procedure TForm1.startServer();
+procedure TForm1.startWithSplash();
begin
Form1.Enabled := False;
Form1.ShowSplashScreen();
TuxUtils.startServer(Application);
Form1.HideSplashScreen();
+end;
+
+
+//Start smart core and display splashscreen.
+procedure TForm1.startServer();
+begin
+ startWithSplash();
+
+ //If server is still not started, trying a second time.
+ if not TuxUtils.isTuxDroidServerStarted() then
+ startWithSplash();
+
Steps.ActivePageIndex := 1;
Form1.Enabled := True;
|
|
From: remi <c2m...@c2...> - 2009-09-17 08:44:10
|
Author: remi
Date: 2009-09-17 10:43:55 +0200 (Thu, 17 Sep 2009)
New Revision: 5426
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetDescription.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcDescription.py
Log:
* Added a normalization of the ugc name. When you switch the global language, the ugc with an original name (Clock, weather) are translated in the new language.
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetDescription.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetDescription.py 2009-09-17 07:52:14 UTC (rev 5425)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetDescription.py 2009-09-17 08:43:55 UTC (rev 5426)
@@ -5,6 +5,8 @@
import os
+from util.applicationserver.plugin.Plugin import SUPPORTED_LANGUAGES_LIST
+
# ------------------------------------------------------------------------------
# Gadget description class.
# ------------------------------------------------------------------------------
@@ -105,6 +107,32 @@
return self.__parent.tr2(language, self.__name)
# --------------------------------------------------------------------------
+ # Normalize a gadget name with the correct translation.
+ # --------------------------------------------------------------------------
+ def normalizeName(self, name):
+ """Normalize a gadget name with the correct translation.
+ @param name: Gadget name to normalize.
+ @return: A string.
+ """
+ isTr = False
+ trLang = None
+ for lang in SUPPORTED_LANGUAGES_LIST:
+ trName = self.getTranslatedName(lang)
+ if name.find(trName) == 0:
+ isTr = True
+ trLang = lang
+ break
+ if isTr:
+ tgLang = self.__parent.getContainer().getLanguage()
+ if tgLang != trLang:
+ tgName = self.getTranslatedName(tgLang)
+ return name.replace(trName, tgName)
+ else:
+ return name
+ else:
+ return name
+
+ # --------------------------------------------------------------------------
# Get the TTS name of the gadget.
# --------------------------------------------------------------------------
def getTtsName(self, language = None):
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcDescription.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcDescription.py 2009-09-17 07:52:14 UTC (rev 5425)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/UgcDescription.py 2009-09-17 08:43:55 UTC (rev 5426)
@@ -56,6 +56,7 @@
self.__dictionary = dictionary
# Get the descriptor values
self.__name = dictionary['name']
+ self.__name = self.__parent.getParentGadget().getDescription().normalizeName(self.__name)
self.__ttsName = self.__name
if dictionary.has_key('ttsName'):
self.__ttsName = dictionary['ttsName']
|
|
From: jerome <c2m...@c2...> - 2009-09-17 07:52:34
|
Author: jerome Date: 2009-09-17 09:52:14 +0200 (Thu, 17 Sep 2009) New Revision: 5425 Added: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.mo software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.po Log: * Added de translations. Added: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.mo =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.po (rev 0) +++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/locale/de/LC_MESSAGES/default.po 2009-09-17 07:52:14 UTC (rev 5425) @@ -0,0 +1,53 @@ +msgid "" +msgstr "" +"Project-Id-Version: TuxBox\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: nux <jer...@ky...>\n" +"Language-Team: kysoh <jer...@ky...>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: English\n" +"X-Poedit-Country: BELGIUM\n" +"X-Poedit-SourceCharset: utf-8\n" + +msgid "TuxDroid server initialization..." +msgstr "TuxBox 2.0 Initialisierung..." + +msgid "TuxBox 2.0 is ready to use." +msgstr "TuxBox 2.0 ist einsatzbereit." + +msgid "Can not stop the Tux Droid server" +msgstr "Kann den Tux Droid Server nicht stoppen" + +msgid "Please, go to start menu to manually stop it." +msgstr "Bitte Menü starten, um es manuell zu stoppen." + +msgid "TuxBox 2.0 is now hidden in the tray icon" +msgstr "TuxBox 2.0 ist nun im Tray Icon verborgen" + +msgid "To open it again, please double-click the tray icon." +msgstr "Um es erneut zu öffnen, Doppelklick auf das Tray Icon." + +msgid "Click here to make this message disappear" +msgstr "Hier klicken, um die Nachricht auszublenden" + +msgid "TuxBox 2.0 Show / Hide" +msgstr "TuxBox 2.0 Anzeigen / Verbergen" + +msgid "TuxBox 2.0 Warning" +msgstr "TuxBox 2.0 Warnhinweis" + +msgid "Show / Hide" +msgstr "Anzeigen / Verbergen" + +msgid "Mute" +msgstr "Stumm" + +msgid "Help" +msgstr "Hilfe" + +msgid "Quit" +msgstr "Beenden" + |
|
From: jerome <c2m...@c2...> - 2009-09-17 07:46:52
|
Author: jerome Date: 2009-09-17 09:46:38 +0200 (Thu, 17 Sep 2009) New Revision: 5424 Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/de/ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/de/test_attitune.att Log: * Added De attitune. Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/de/test_attitune.att =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/attitunes/de/test_attitune.att ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: jerome <c2m...@c2...> - 2009-09-17 07:31:44
|
Author: jerome Date: 2009-09-17 09:31:32 +0200 (Thu, 17 Sep 2009) New Revision: 5423 Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/de/ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/de/LC_MESSAGES/ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/de/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/de/LC_MESSAGES/default.po Log: * Added De translations. Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/de/LC_MESSAGES/default.mo =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/de/LC_MESSAGES/default.mo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/de/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/de/LC_MESSAGES/default.po (rev 0) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/de/LC_MESSAGES/default.po 2009-09-17 07:31:32 UTC (rev 5423) @@ -0,0 +1,80 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: nux <jer...@ky...>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "The software installation is completed sucessfully. Now, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." +msgstr "Die Softwareinstallation wurde erfolgreich beendet. Sie werden nun durch mehrer Schritte geleitet um noch einmal zu überprüfen, ob Ihr Tux Droid problemlos mit der Software zusammenarbeitet." + +msgid "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues Next, put the power switch on the back of Tux Droid in the on position" +msgstr "Schließen Sie bitte den Trafo an einen Wechselstromanschluss an, um Ihren Tux Droid mit Strom zu versorgen. Die Batterieleistung könnte zu diesem Zeitpunkt zu schwach sein und dadurch Stabilitätsprobleme verursachen. Schalten Sie nun den Netzschalter auf der Rückseite des Tux Droid auf Ein." + +msgid "Connect the fish dongle to an available USB port on your computer using the included USB cable." +msgstr "Den Fisch-Dongle mit dem beiliegenden USB-Kabel an eine geeignete USB-Buchse anschließen." + +msgid "Wait a moment and the blue LED''s in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer" +msgstr "Warten Sie einen Moment bis die blauen Augen von Dongle und Tux Droid leuchten. Dadurch wird angezeigt, dass Tux Droid vom Dongle erkannt wurde und bereit ist für die Kommunikation mit Ihrem Computer" + +msgid "Everything is set up to test your configuration. Click the Test button to start the test." +msgstr "Alles ist nun eingerichtet, um Ihre Konfiguration zu testen. Klicken Sie die Test-Taste, um den Test zu starten." + +msgid "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue" +msgstr "Ihr Tux Droid ist nun korrekt konfiguriert und spielbereit! Klicken Sie auf die Finish-Taste, um fortzufahren" + +msgid "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." +msgstr "Hat Ihr Tux Droid gesprochen und sich bewegt? Wenn ja, die Taste Ja drücken, wenn nichts passiert ist, drücken Sie auf Nein." + +msgid "Your Tux Droid was not detected correctly. Please, try again." +msgstr "Ihr Tux Droid wurde nicht korrekt erkannt. Versuchen Sie es noch einmal." + +msgid "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh box to get help? ( recommended )" +msgstr "Ein unvorhergesehener Fehler ist an Ihrem Tux Droid aufgetreten. Möchten Sie einen Bericht an die Kysoh Mailbox senden, um Hilfe zu erhalten? (empfohlen)" + +msgid "Launch TuxBox 2.0 now?" +msgstr "TuxBox 2.0 jetzt starten?" + +msgid "Help us to improve our software by sending the test report. No personal information will be exchanged." +msgstr "Helfen Sie uns, unsere Software zu verbessern und senden Sie bitte ihren Test-Bericht. Es werden dabei keine personenbezogenen Daten übermittelt." + +msgid "Yes" +msgstr "Ja" + +msgid "No" +msgstr "Nein" + +msgid "Test" +msgstr "Test" + +msgid "Finish" +msgstr "Exit" + +msgid "Next" +msgstr "Weiter" + +msgid "Previous" +msgstr "Zurück" + +msgid "Exit" +msgstr "Exit" + +msgid "The Tux Droid software was not started correctly. Please, click the Test button to try again." +msgstr "Das Tux Droid-Programm wurde nicht korrekt gestartet. Klicken Sie bitte auf die Test-Taste und versuchen Sie es erneut." + +msgid "Your Fish dongle was not detected. Please make sure your dongle is connected to an available USB port at the backside of your computer." +msgstr "Ihr Fisch-Dongle wurde nicht erkannt. Prüfen Sie, ob der Dongle an eine freie USB-Buchse an der Rückseite Ihres Computers angeschlossen ist." + +msgid "The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again." +msgstr "Die Funkverbindung zwischen Tux Droid und Fisch--Dongle wurde nicht hergestellt. Stellen Sie sicher, dass Ihr Tux Droid an den Trafo angeschlossen ist und stellen Sie zurück, indem Sie Tux Droid aus und dann wieder einschalten." + +msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." +msgstr "Ihr Fisch-Dongle konnte von Windows nicht korrekt erkannt werden. Schließen Sie den Dongle wieder an." + +msgid "Please wait while the dongle is being installed." +msgstr "Bitte warten Sie, während den Dongle installiert wird." + |
|
From: jerome <c2m...@c2...> - 2009-09-17 07:18:02
|
Author: jerome
Date: 2009-09-17 09:17:48 +0200 (Thu, 17 Sep 2009)
New Revision: 5422
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Replaced HID installation timeout by a dialog box.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-17 06:52:11 UTC (rev 5421)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-17 07:17:48 UTC (rev 5422)
@@ -356,24 +356,23 @@
//**** Step 3 on screen => Testing dongle state****//
begin
- Inc(hardwareTestCount, 1);
-
- //Checking first HID state.
- with TDongleHIDCheck.create(nil) do
- begin
- invalidateButtons();
- if not Check() then
- BoxOk1.showMessageDialog(gettext(HID_INSTALL_WAIT), gettext(OK));
- validateButtons();
- end;
-
if not TuxUtils.isDongleConnected(values) then
begin
invalidateButtons();
- Report.DONGLE := False;
- BoxOk1.showMessageDialog(gettext(DONGLE_ERROR), gettext(OK));
- Steps.ActivePageIndex := 1;
- NextLabel.Caption := gettext(NEXTB);
+
+ //Checking first HID state.
+ with TDongleHIDCheck.create(nil) do
+
+ if not Check() then
+ BoxOk1.showMessageDialog(gettext(HID_INSTALL_WAIT), gettext(OK))
+ else
+ begin
+ Report.DONGLE := False;
+ BoxOk1.showMessageDialog(gettext(DONGLE_ERROR), gettext(OK));
+ Steps.ActivePageIndex := 1;
+ NextLabel.Caption := gettext(NEXTB);
+ end;
+
Next.OnMouseUp := Form1.NextMouseUp;
NextLabel.OnMouseUp := Form1.NextMouseUp;
end
|
|
From: ks156 <c2m...@c2...> - 2009-09-17 06:52:23
|
Author: ks156
Date: 2009-09-17 08:52:11 +0200 (Thu, 17 Sep 2009)
New Revision: 5421
Modified:
software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py
Log:
* Forgot to remove a commented parts
Modified: software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py
===================================================================
--- software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py 2009-09-17 06:48:08 UTC (rev 5420)
+++ software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py 2009-09-17 06:52:11 UTC (rev 5421)
@@ -43,8 +43,6 @@
self.tux = TuxAPI("127.0.0.1", 270)
if not self.tux.server.connect(CLIENT_LEVEL_RESTRICTED, 'TuxMaxLight', 'plugin-maxlight'):
- # self.tux.server.disconnect()
- #else:
self.tgp_port = 54321
self.tux = TuxAPI(self.tgp_ip, self.tgp_port)
|
|
From: ks156 <c2m...@c2...> - 2009-09-17 06:48:21
|
Author: ks156
Date: 2009-09-17 08:48:08 +0200 (Thu, 17 Sep 2009)
New Revision: 5420
Modified:
software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py
Log:
* Fixed the plugin to switch from port 270 to 54321 if needed.
The previous version has problems when it was started as normal user.
Modified: software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py
===================================================================
--- software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py 2009-09-17 06:36:36 UTC (rev 5419)
+++ software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py 2009-09-17 06:48:08 UTC (rev 5420)
@@ -34,26 +34,26 @@
tgp_language = "en"
tgp_ip = "127.0.0.1"
tgp_port = 270
- tux = TuxAPI("127.0.0.1", 270)
def __init__(self, plug):
'''
'''
self.plugin = plug
+
+ self.tux = TuxAPI("127.0.0.1", 270)
+
+ if not self.tux.server.connect(CLIENT_LEVEL_RESTRICTED, 'TuxMaxLight', 'plugin-maxlight'):
+ # self.tux.server.disconnect()
+ #else:
+ self.tgp_port = 54321
+ self.tux = TuxAPI(self.tgp_ip, self.tgp_port)
-
def tuxConnect(self):
'''
Wait connected
'''
-
self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'TuxMaxLight', 'plugin-maxlight')
- if os.name != 'nt':
- sleep(0.5)
- if not self.tux.server.getConnected():
- self.tux = TuxAPI("127.0.0.1", 54321)
- self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'TuxMaxLight', 'plugin-maxlight')
self.tux.server.waitConnected(5.0)
self.tux.dongle.waitConnected(5.0)
|
|
From: jerome <c2m...@c2...> - 2009-09-17 06:36:47
|
Author: jerome
Date: 2009-09-17 08:36:36 +0200 (Thu, 17 Sep 2009)
New Revision: 5419
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Box.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/BoxOk.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Removed a debug timer.
* Force dialog forms to be displayed foreground.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Box.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Box.pas 2009-09-16 15:13:56 UTC (rev 5418)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Box.pas 2009-09-17 06:36:36 UTC (rev 5419)
@@ -135,7 +135,7 @@
Form2.setCaptions(okCaption, cancelCaption);
Form2.setMessage(msg);
Form2.Show;
-
+ SetForegroundWindow(Form2.Handle);
while Form2.Visible do
begin
sleep(300);
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/BoxOk.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/BoxOk.pas 2009-09-16 15:13:56 UTC (rev 5418)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/BoxOk.pas 2009-09-17 06:36:36 UTC (rev 5419)
@@ -116,7 +116,7 @@
Form3.setCaptions(okCaption);
Form3.setMessage(msg);
Form3.Show;
-
+ SetForegroundWindow(Form3.Handle);
while Form3.Visible do
begin
sleep(300);
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm 2009-09-16 15:13:56 UTC (rev 5418)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm 2009-09-17 06:36:36 UTC (rev 5419)
@@ -1,6 +1,6 @@
object Form4: TForm4
- Left = 496
- Top = 260
+ Left = 497
+ Top = 261
BorderStyle = bsNone
Caption = 'Form4'
ClientHeight = 107
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm 2009-09-16 15:13:56 UTC (rev 5418)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm 2009-09-17 06:36:36 UTC (rev 5419)
@@ -1,6 +1,6 @@
object Form1: TForm1
- Left = 635
- Top = 269
+ Left = 636
+ Top = 219
BorderIcons = [biSystemMenu, biMinimize]
BorderStyle = bsNone
Caption = 'TuxBox 2.0'
@@ -20,7 +20,6 @@
PrintScale = poNone
Scaled = False
Visible = True
- OnActivate = FormActivate
OnClose = FormClose
OnCreate = FormCreate
PixelsPerInch = 96
@@ -6783,11 +6782,4 @@
Left = 184
Top = 336
end
- object Timer1: TTimer
- Enabled = False
- Interval = 60000
- OnTimer = Timer1Timer
- Left = 256
- Top = 352
- end
end
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-16 15:13:56 UTC (rev 5418)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-17 06:36:36 UTC (rev 5419)
@@ -96,7 +96,9 @@
'Please try to re-install the Tux Droid software. In case that does not ' +
'help please visit our forums or contact customer support.';
+ HID_INSTALL_WAIT = 'Please wait while the dongle is being installed.';
+
type
TForm1 = class(TForm)
IdAntiFreeze1: TIdAntiFreeze;
@@ -149,7 +151,6 @@
LabelLaunch: TLabel;
LabelSendReport: TLabel;
IdSSLIOHandlerSocket1: TIdSSLIOHandlerSocket;
- Timer1: TTimer;
procedure FormCreate(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure ExitButtonClick(down : boolean);
@@ -184,8 +185,6 @@
procedure AskAndSend();
procedure validateButtons();
procedure invalidateButtons();
- procedure Timer1Timer(Sender: TObject);
- procedure FormActivate(Sender: TObject);
@@ -267,8 +266,6 @@
CheckSendReport.Checked := False;
CheckSendReport.Visible := False;
LabelSendReport.Visible := False;
-
- Timer1.Enabled := true;
end;
@@ -327,9 +324,6 @@
{#### Next button clicked ####}
procedure TForm1.NextButtonClick();
-var
- HIDTimeout : Integer;
- HIDCheck : boolean;
begin
//Invalidate buttons
invalidateButtons();
@@ -368,29 +362,8 @@
with TDongleHIDCheck.create(nil) do
begin
invalidateButtons();
- HIDCheck := False;
- HIDTimeout := 0;
- while not HIDCheck do
- begin
- if not ( HIDTimeout >= 60 ) then
- begin
- sleep(1000);
- HIDCheck := Check();
- Application.ProcessMessages();
- Inc(HIDTimeout, 1);
- end;
- end;
- //If detected, sleeping to let Windows finishing install drivers ( needed for low perf computers ).
- sleep(3000);
- //Finally, refreshing states.
- try
- if values <> nil then
- values.Clear;
- TuxUtils.getStates(values);
- sleep(500);
- except
-
- end;
+ if not Check() then
+ BoxOk1.showMessageDialog(gettext(HID_INSTALL_WAIT), gettext(OK));
validateButtons();
end;
@@ -879,6 +852,7 @@
sleep(2000);
Form4.Timer1.Enabled := true;
Form4.Visible := true;
+ SetForegroundWindow(Form4.Handle);
Application.ProcessMessages;
sleep(1000);
end;
@@ -905,26 +879,4 @@
Form4.Visible := false;
end;
-
-//
-procedure TForm1.Timer1Timer(Sender: TObject);
-begin
- if Form1.Tag = 1 then
- begin
- Timer1.Enabled := False;
-
- Form1.BorderStyle := bsNone;
- Application.ProcessMessages;
- sleep(2000);
- Form1.Refresh;
- Form1.Repaint;
- Application.ProcessMessages;
- end;
-end;
-
-procedure TForm1.FormActivate(Sender: TObject);
-begin
- Form1.Tag := 1;
-end;
-
end.
|
|
From: ks156 <c2m...@c2...> - 2009-09-16 15:14:09
|
Author: ks156
Date: 2009-09-16 17:13:56 +0200 (Wed, 16 Sep 2009)
New Revision: 5418
Modified:
software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py
Log:
* Added a test to connect the API in the right server port.
Modified: software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py
===================================================================
--- software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py 2009-09-16 14:59:21 UTC (rev 5417)
+++ software_suite_v3/software/plugin/plugin-maxlight/trunk/executables/plugin-maxlight.py 2009-09-16 15:13:56 UTC (rev 5418)
@@ -49,6 +49,12 @@
'''
self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'TuxMaxLight', 'plugin-maxlight')
+ if os.name != 'nt':
+ sleep(0.5)
+ if not self.tux.server.getConnected():
+ self.tux = TuxAPI("127.0.0.1", 54321)
+ self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'TuxMaxLight', 'plugin-maxlight')
+
self.tux.server.waitConnected(5.0)
self.tux.dongle.waitConnected(5.0)
self.tux.radio.waitConnected(5.0)
|
|
From: ks156 <c2m...@c2...> - 2009-09-16 14:59:40
|
Author: ks156
Date: 2009-09-16 16:59:21 +0200 (Wed, 16 Sep 2009)
New Revision: 5417
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/menu.css
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/index.xsl
Log:
* Changed the CSS to verticaly align the interface.
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/menu.css
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/menu.css 2009-09-16 14:58:12 UTC (rev 5416)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/css/menu.css 2009-09-16 14:59:21 UTC (rev 5417)
@@ -1,12 +1,12 @@
div.ContentView{
position:absolute;
- left:0px;
+ left:50%;
top:0px;
width:855px;
height:535px;
display:table;
margin-top:65px;
- margin-left:50px;
+ margin-left:-428px;
margin-right:50px;
background-color:#EFEFEF;
color:#EFEFEF;
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/index.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/index.xsl 2009-09-16 14:58:12 UTC (rev 5416)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/index.xsl 2009-09-16 14:59:21 UTC (rev 5417)
@@ -112,10 +112,10 @@
<!-- MAIN DIV FRAMES -->
<div style="position:absolute;
top:0px;
- left:0px;
+ left:50%;
height:65px;
width:855px;
- margin-left:50px;
+ margin-left:-428px;
margin-right:50px;">
<xsl:element name="a">
<xsl:attribute name="class">menuLeftEnable</xsl:attribute>
@@ -172,4 +172,4 @@
</body>
</html>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
|
|
From: ks156 <c2m...@c2...> - 2009-09-16 14:58:35
|
Author: ks156
Date: 2009-09-16 16:58:12 +0200 (Wed, 16 Sep 2009)
New Revision: 5416
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/menu.css
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/index.xsl
Log:
* Changed the CSS to verticaly align the interface.
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/menu.css
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/menu.css 2009-09-16 13:41:47 UTC (rev 5415)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/css/menu.css 2009-09-16 14:58:12 UTC (rev 5416)
@@ -1,12 +1,12 @@
div.ContentView{
position:absolute;
- left:0px;
+ left:50%;
top:0px;
width:855px;
height:535px;
display:table;
margin-top:65px;
- margin-left:50px;
+ margin-left:-428px;
margin-right:50px;
background-color:#EFEFEF;
color:#EFEFEF;
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/index.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/index.xsl 2009-09-16 13:41:47 UTC (rev 5415)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/index.xsl 2009-09-16 14:58:12 UTC (rev 5416)
@@ -112,10 +112,10 @@
<!-- MAIN DIV FRAMES -->
<div style="position:absolute;
top:0px;
- left:0px;
+ left:50%;
height:65px;
width:855px;
- margin-left:50px;
+ margin-left:-428px;
margin-right:50px;">
<xsl:element name="a">
<xsl:attribute name="class">menuLeftEnable</xsl:attribute>
@@ -172,4 +172,4 @@
</body>
</html>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
|
|
From: jerome <c2m...@c2...> - 2009-09-16 14:09:46
|
Author: jerome Date: 2009-09-16 15:41:47 +0200 (Wed, 16 Sep 2009) New Revision: 5415 Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/default.pot software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po Log: * Updated po and mo files. Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/default.pot =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/default.pot 2009-09-16 13:28:19 UTC (rev 5414) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/default.pot 2009-09-16 13:41:47 UTC (rev 5415) @@ -66,4 +66,7 @@ msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." msgstr "" + +msgid "Please wait while the dongle is being installed." +msgstr "" \ No newline at end of file Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.mo =================================================================== (Binary files differ) Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po 2009-09-16 13:28:19 UTC (rev 5414) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po 2009-09-16 13:41:47 UTC (rev 5415) @@ -78,3 +78,6 @@ msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." msgstr "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." +msgid "Please wait while the dongle is being installed." +msgstr "Please wait while the dongle is being installed." + Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.mo =================================================================== (Binary files differ) Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po 2009-09-16 13:28:19 UTC (rev 5414) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po 2009-09-16 13:41:47 UTC (rev 5415) @@ -78,3 +78,6 @@ msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." msgstr "Il semble y avoir un problème avec votre installation logicielle. Essayez d'installer à nouveau la suite logicielle. Dans le cas où celà n'aiderais pas, s'il vous plait, visitez notre forum ou contactez le service clientelle." +msgid "Please wait while the dongle is being installed." +msgstr "S'il vous plait, patientez pendant l'installation du dongle." + Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.mo =================================================================== (Binary files differ) Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po 2009-09-16 13:28:19 UTC (rev 5414) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po 2009-09-16 13:41:47 UTC (rev 5415) @@ -78,3 +78,6 @@ msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." msgstr "Er is een probleem opgetreden met de software installatie. Gelieve de Tux Droid software opnieuw te installeren. Als dit ook niet helpt, neem een kijkje op onze forums of contacteer onze customer support." +msgid "Please wait while the dongle is being installed." +msgstr "Gelieve te wachten tot de dongle geïnstalleerd is." + |
|
From: ks156 <c2m...@c2...> - 2009-09-16 13:28:33
|
Author: ks156
Date: 2009-09-16 15:28:19 +0200 (Wed, 16 Sep 2009)
New Revision: 5414
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_bottom_2.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_bottom_3.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_middle_3.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_middle_4.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_activate.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_disable.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_enable.png
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/attitunes.xsl
software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadgets.xsl
software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py
Log:
* Merged rev 5393 to 5413 from trunk into user_mode
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_bottom_2.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_bottom_3.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_middle_3.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/frame_01_middle_4.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_activate.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_disable.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/img/gadgets_btn_delete_enable.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/attitunes.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/attitunes.xsl 2009-09-16 13:23:57 UTC (rev 5413)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/attitunes.xsl 2009-09-16 13:28:19 UTC (rev 5414)
@@ -167,14 +167,14 @@
htmlContent += '<div class="attitunesRowIcon"><img src="' + icon + '" height="34" width="34" id="' + iconId + '"></img></div>';
htmlContent += '<div class="attitunesVSpacer" style="width:10px;"></div>';
htmlContent += '<span class="attitunesRowName">' + name + '</span>';
- htmlContent += '<div class="attitunesVSpacer" style="width:10px;"></div>';
+ htmlContent += '<div class="attitunesVSpacer" style="width:26px;"></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 += '<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="attitunesBtnTitle attitunesBtnDelete" id="deleteId_' + name + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete">' + translationDelete + '</a>';
+ htmlContent += '<a class="attitunesBtnNoTitle attitunesBtnDelete" id="deleteId_' + name + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"></a>';
htmlContent += '<div class="frame01Sep2"></div>';
return htmlContent;
}
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadgets.xsl 2009-09-16 13:23:57 UTC (rev 5413)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadgets.xsl 2009-09-16 13:28:19 UTC (rev 5414)
@@ -202,7 +202,7 @@
htmlContent += '<div class="gadgetsRowIcon"><img src="' + icon + '" height="34" width="34" id="' + iconId + '"></img></div>';
htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
htmlContent += '<span class="gadgetsRowName">' + name + '</span>';
- htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
+ htmlContent += '<div class="gadgetsVSpacer" style="width:26px;"></div>';
if (ondemand == 'true')
{
htmlContent += '<a class="gadgetsBtnTitle gadgetsBtnStartEnable" id="startId_' + uuid + '" onclick="javascript:startGadget(\''+uuid+'\');return false;" href="#">' + translationStart + '</a>';
@@ -227,7 +227,7 @@
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="gadgetsBtnTitle gadgetsBtnDelete" id="deleteId_' + uuid + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete">' + translationDelete + '</a>';
+ htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDelete" id="deleteId_' + uuid + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"></a>';
htmlContent += '<div class="frame01Sep2"></div>';
return htmlContent;
}
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py 2009-09-16 13:23:57 UTC (rev 5413)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py 2009-09-16 13:28:19 UTC (rev 5414)
@@ -148,6 +148,7 @@
self.__ugcContainer, self.__ugcContainer.getLanguage(),
resourcesManager)
self.insertTemporaryServedUgcInContainer(ugcUrl)
+ time.sleep(0.015)
def removeGadgetsWithoutChildren(self):
"""Remove the gadgets without UGC children.
|
|
From: remi <c2m...@c2...> - 2009-09-16 13:24:14
|
Author: remi
Date: 2009-09-16 15:23:57 +0200 (Wed, 16 Sep 2009)
New Revision: 5413
Modified:
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/frame_01_bottom_2.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/frame_01_bottom_3.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/frame_01_middle_3.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/frame_01_middle_4.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/gadgets_btn_delete_activate.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/gadgets_btn_delete_disable.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/gadgets_btn_delete_enable.png
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/attitunes.xsl
software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
Log:
* Fixed "delete" button on gadgets and attitunes page.
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/frame_01_bottom_2.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/frame_01_bottom_3.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/frame_01_middle_3.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/frame_01_middle_4.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/gadgets_btn_delete_activate.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/gadgets_btn_delete_disable.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/img/gadgets_btn_delete_enable.png
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/attitunes.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/attitunes.xsl 2009-09-16 13:22:04 UTC (rev 5412)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/attitunes.xsl 2009-09-16 13:23:57 UTC (rev 5413)
@@ -167,14 +167,14 @@
htmlContent += '<div class="attitunesRowIcon"><img src="' + icon + '" height="34" width="34" id="' + iconId + '"></img></div>';
htmlContent += '<div class="attitunesVSpacer" style="width:10px;"></div>';
htmlContent += '<span class="attitunesRowName">' + name + '</span>';
- htmlContent += '<div class="attitunesVSpacer" style="width:10px;"></div>';
+ htmlContent += '<div class="attitunesVSpacer" style="width:26px;"></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 += '<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="attitunesBtnTitle attitunesBtnDelete" id="deleteId_' + name + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete">' + translationDelete + '</a>';
+ htmlContent += '<a class="attitunesBtnNoTitle attitunesBtnDelete" id="deleteId_' + name + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"></a>';
htmlContent += '<div class="frame01Sep2"></div>';
return htmlContent;
}
Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-09-16 13:22:04 UTC (rev 5412)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/xsl/gadgets.xsl 2009-09-16 13:23:57 UTC (rev 5413)
@@ -202,7 +202,7 @@
htmlContent += '<div class="gadgetsRowIcon"><img src="' + icon + '" height="34" width="34" id="' + iconId + '"></img></div>';
htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
htmlContent += '<span class="gadgetsRowName">' + name + '</span>';
- htmlContent += '<div class="gadgetsVSpacer" style="width:10px;"></div>';
+ htmlContent += '<div class="gadgetsVSpacer" style="width:26px;"></div>';
if (ondemand == 'true')
{
htmlContent += '<a class="gadgetsBtnTitle gadgetsBtnStartEnable" id="startId_' + uuid + '" onclick="javascript:startGadget(\''+uuid+'\');return false;" href="#">' + translationStart + '</a>';
@@ -227,7 +227,7 @@
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="gadgetsBtnTitle gadgetsBtnDelete" id="deleteId_' + uuid + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete">' + translationDelete + '</a>';
+ htmlContent += '<a class="gadgetsBtnNoTitle gadgetsBtnDelete" id="deleteId_' + uuid + '" onclick="" href="#" name="lbOn" rel="popupConfirmDelete"></a>';
htmlContent += '<div class="frame01Sep2"></div>';
return htmlContent;
}
|
|
From: jerome <c2m...@c2...> - 2009-09-16 13:22:19
|
Author: jerome
Date: 2009-09-16 15:22:04 +0200 (Wed, 16 Sep 2009)
New Revision: 5412
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Starting application at 'run' instead of 'run once' for win xp.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-16 09:47:42 UTC (rev 5411)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-16 13:22:04 UTC (rev 5412)
@@ -26,7 +26,7 @@
uses
ShellAPI, Registry, SysUtils, Variants, Classes, TlHelp32,
ComCtrls, StdCtrls, OleCtrls, Controls, Windows, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
- IdHTTP, dialogs, Forms;
+ IdHTTP, dialogs, Forms, ComputerInfos;
function DownloadHTTP(const AUrl : string): string;
function getStates(var values : TStringList): boolean;
@@ -53,6 +53,7 @@
function GetTuxDroidDataBaseDirectory() : string;
function GetTuxDroidBinariesDirectory() : string;
function getRegisteryLanguage(): string;
+ procedure deleteRun();
var
@@ -534,4 +535,28 @@
Result := Result[1] + Result[2];
end;
+
+procedure deleteRun();
+const
+ REGISTRY_PATH = 'SOFTWARE\Microsoft\Windows\CurrentVersion\Run';
+begin
+
+ if ComputerInfos.GetWinVersion() = ComputerInfos.wvWinVista then
+ exit;
+
+ with TRegistry.Create do
+ try
+ RootKey := HKEY_LOCAL_MACHINE;
+
+ // From Tuxdroid setup
+ if OpenKey(REGISTRY_PATH, True) then
+ begin
+ DeleteValue('SecondInstallerTux');
+ CloseKey;
+ end;
+ finally
+ Free;
+ end;
+end;
+
end.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm 2009-09-16 09:47:42 UTC (rev 5411)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm 2009-09-16 13:22:04 UTC (rev 5412)
@@ -1,6 +1,6 @@
object Form1: TForm1
- Left = 427
- Top = 221
+ Left = 635
+ Top = 269
BorderIcons = [biSystemMenu, biMinimize]
BorderStyle = bsNone
Caption = 'TuxBox 2.0'
@@ -20,6 +20,7 @@
PrintScale = poNone
Scaled = False
Visible = True
+ OnActivate = FormActivate
OnClose = FormClose
OnCreate = FormCreate
PixelsPerInch = 96
@@ -6782,4 +6783,11 @@
Left = 184
Top = 336
end
+ object Timer1: TTimer
+ Enabled = False
+ Interval = 60000
+ OnTimer = Timer1Timer
+ Left = 256
+ Top = 352
+ end
end
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-16 09:47:42 UTC (rev 5411)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-16 13:22:04 UTC (rev 5412)
@@ -149,6 +149,7 @@
LabelLaunch: TLabel;
LabelSendReport: TLabel;
IdSSLIOHandlerSocket1: TIdSSLIOHandlerSocket;
+ Timer1: TTimer;
procedure FormCreate(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure ExitButtonClick(down : boolean);
@@ -183,6 +184,8 @@
procedure AskAndSend();
procedure validateButtons();
procedure invalidateButtons();
+ procedure Timer1Timer(Sender: TObject);
+ procedure FormActivate(Sender: TObject);
@@ -225,6 +228,12 @@
//Creating gnugettext object.
try
+ TuxUtils.deleteRun();
+ except
+
+ end;
+
+ try
gnugettext.UseLanguage(TuxUtils.getRegisteryLanguage());
except
gnugettext.UseLanguage('en');
@@ -258,6 +267,8 @@
CheckSendReport.Checked := False;
CheckSendReport.Visible := False;
LabelSendReport.Visible := False;
+
+ Timer1.Enabled := true;
end;
@@ -896,4 +907,24 @@
//
+procedure TForm1.Timer1Timer(Sender: TObject);
+begin
+ if Form1.Tag = 1 then
+ begin
+ Timer1.Enabled := False;
+
+ Form1.BorderStyle := bsNone;
+ Application.ProcessMessages;
+ sleep(2000);
+ Form1.Refresh;
+ Form1.Repaint;
+ Application.ProcessMessages;
+ end;
+end;
+
+procedure TForm1.FormActivate(Sender: TObject);
+begin
+ Form1.Tag := 1;
+end;
+
end.
|
|
From: jerome <c2m...@c2...> - 2009-09-16 09:47:54
|
Author: jerome
Date: 2009-09-16 11:47:42 +0200 (Wed, 16 Sep 2009)
New Revision: 5411
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Fixed a bug playing en_US attitune.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-16 09:30:49 UTC (rev 5410)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-16 09:47:42 UTC (rev 5411)
@@ -523,6 +523,7 @@
if ( result <> 'en' )and (result <> 'fr') and (result <> 'no') and (result <> 'pt' )
and(result <> 'nl') and (result <> 'nl_BE') and (result <> 'it') and (result <> 'es')
and(result <> 'de') and (result <> 'ar') and (result <> 'da') and (result <> 'sv')
+ and(result <> 'en_US') and ( result <> 'en_GB' )
then result := 'en';
CloseKey;
@@ -530,6 +531,7 @@
finally
Free;
end;
+ Result := Result[1] + Result[2];
end;
end.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-16 09:30:49 UTC (rev 5410)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-16 09:47:42 UTC (rev 5411)
@@ -894,4 +894,6 @@
Form4.Visible := false;
end;
+
+//
end.
|
|
From: jerome <c2m...@c2...> - 2009-09-16 09:31:03
|
Author: jerome
Date: 2009-09-16 11:30:49 +0200 (Wed, 16 Sep 2009)
New Revision: 5410
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
Log:
* Fixed a bug playing en_US attitune.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-16 09:20:55 UTC (rev 5409)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-16 09:30:49 UTC (rev 5410)
@@ -520,11 +520,10 @@
result := ReadString('Language');
- if ( result <> 'en' ) and (result <> 'en_US') and (result <> 'en_GB') and (result <> 'fr')
+ if ( result <> 'en' )and (result <> 'fr') and (result <> 'no') and (result <> 'pt' )
and(result <> 'nl') and (result <> 'nl_BE') and (result <> 'it') and (result <> 'es')
and(result <> 'de') and (result <> 'ar') and (result <> 'da') and (result <> 'sv')
- and(result <> 'no') and (result <> 'pt' ) then
- result := 'en';
+ then result := 'en';
CloseKey;
end;
|
|
From: remi <c2m...@c2...> - 2009-09-16 09:21:05
|
Author: remi Date: 2009-09-16 11:20:55 +0200 (Wed, 16 Sep 2009) New Revision: 5409 Modified: software_suite_v3/software/plugin/plugin-webradio-de/trunk/executables/WebRadioList.py Log: * Fixed radio list with german radios Modified: software_suite_v3/software/plugin/plugin-webradio-de/trunk/executables/WebRadioList.py =================================================================== --- software_suite_v3/software/plugin/plugin-webradio-de/trunk/executables/WebRadioList.py 2009-09-16 09:00:30 UTC (rev 5408) +++ software_suite_v3/software/plugin/plugin-webradio-de/trunk/executables/WebRadioList.py 2009-09-16 09:20:55 UTC (rev 5409) @@ -1,13 +1,13 @@ # Web radios dictionary WEBRADIO = [ - ["France-Inter", "http://viphttp.yacast.net/V4/radiofrance/franceinter_hd.m3u"], - ["RMC-Info", "http://cache.yacast.fr/V4/rmc/rmc.m3u"], - ["France-Info", "http://viphttp.yacast.net/V4/radiofrance/franceinfo_bd.m3u"], - ["France-Culture", "http://viphttp.yacast.net/V4/radiofrance/franceculture_hd.m3u"], - ["Le-Mouv", "http://viphttp.yacast.net/V4/radiofrance/lemouv_hd.m3u"], - ["France-Musique", "http://viphttp.yacast.net/V4/radiofrance/francemusique_hd.m3u"], - ["France-Bleu-Ile-de-France", "http://viphttp.yacast.net/V4/radiofrance/francebleu_idf_hd.m3u"], - ["BBC2", "http://bbc.co.uk/radio/listen/live/r2.ram"], - ["RFM", "mms://viplagardere.yacast.net/encoderrfm"], - ["Click'And'rock", "http://240plan.ovh.net/~clicknro/_www/www/dwd/player/hautdebit_wmp.wax"], + ["WDR 1Live", "http://metafiles.gl-systemhaus.de/wdr/channel_einslive.m3u"], + ["WDR2", "http://metafiles.gl-systemhaus.de/wdr/channel_einslivediggi.m3u"], + ["Radio2Day", "http://radio2day.ip-streaming.net/radio2day.m3u"], + ["Sunshine Live", "http://62.27.44.15/sunshinelive/livestream.mp3"], + ["Rockland Digital", "http://ice.streaming.spacenet.de:80/rockland.m3u"], + ["Hit Radio FFH", "http://edge.live.mp3.mdn.newmedia.nacamar.net/radioffh/livestream.mp3.m3u"], + ["Antenne Bayern", "http://www.antenne.de/webradio/antenne.m3u"], + ["N-JOY", "http://ndr.ic.llnwd.net/stream/ndr_n-joy_hi_mp3"], + ["Jam FM", "http://stream.telvi.de:8000/jamfm1"], + ["You FM", "http://metafiles.gl-systemhaus.de/hr/youfm_2.m3u"], ] |
|
From: remi <c2m...@c2...> - 2009-09-16 09:00:43
|
Author: remi
Date: 2009-09-16 11:00:30 +0200 (Wed, 16 Sep 2009)
New Revision: 5408
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py
Log:
* Fixed bug on ugc creations. 2 ugcs created in the same msec had a chance to have the same uuid.
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py 2009-09-16 08:43:30 UTC (rev 5407)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py 2009-09-16 09:00:30 UTC (rev 5408)
@@ -148,6 +148,7 @@
self.__ugcContainer, self.__ugcContainer.getLanguage(),
resourcesManager)
self.insertTemporaryServedUgcInContainer(ugcUrl)
+ time.sleep(0.015)
def removeGadgetsWithoutChildren(self):
"""Remove the gadgets without UGC children.
|
|
From: remi <c2m...@c2...> - 2009-09-16 08:43:44
|
Author: remi
Date: 2009-09-16 10:43:30 +0200 (Wed, 16 Sep 2009)
New Revision: 5407
Modified:
software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po
Log:
* Fixed google weather url for "de" language
Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po 2009-09-16 08:24:08 UTC (rev 5406)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po 2009-09-16 08:43:30 UTC (rev 5407)
@@ -30,7 +30,7 @@
msgstr "Das Wetter für morgen. \"{0}\" Temperaturen zwischen {1} und {2} Grad."
msgid "http://www.google.com/ig/api?hl=en&weather=%s"
-msgstr "http://www.google.com/ig/api?hl=en&weather=%s"
+msgstr "http://www.google.com/ig/api?hl=de&weather=%s"
msgid "Start every x from full hour"
msgstr "Regelmäßiger Bericht"
|
|
From: remi <c2m...@c2...> - 2009-09-16 08:24:18
|
Author: remi Date: 2009-09-16 10:24:08 +0200 (Wed, 16 Sep 2009) New Revision: 5406 Added: software_suite_v3/software/gadget/online_only/trunk/build.bat software_suite_v3/software/gadget/online_only/trunk/build.py software_suite_v3/software/gadget/online_only/trunk/builder/ software_suite_v3/software/gadget/online_only/trunk/builder/GadgetPackager.py software_suite_v3/software/gadget/online_only/trunk/builder/__init__.py software_suite_v3/software/gadget/online_only/trunk/builder/util/ software_suite_v3/software/gadget/online_only/trunk/builder/util/__init__.py software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/ software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/DirectoriesAndFilesTools.py software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/__init__.py software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/version.py software_suite_v3/software/gadget/online_only/trunk/builder/version.py Log: * Added a builder to automatically make scg files Added: software_suite_v3/software/gadget/online_only/trunk/build.bat =================================================================== --- software_suite_v3/software/gadget/online_only/trunk/build.bat (rev 0) +++ software_suite_v3/software/gadget/online_only/trunk/build.bat 2009-09-16 08:24:08 UTC (rev 5406) @@ -0,0 +1,2 @@ +python build.py +cmd \ No newline at end of file Added: software_suite_v3/software/gadget/online_only/trunk/build.py =================================================================== --- software_suite_v3/software/gadget/online_only/trunk/build.py (rev 0) +++ software_suite_v3/software/gadget/online_only/trunk/build.py 2009-09-16 08:24:08 UTC (rev 5406) @@ -0,0 +1,36 @@ +# -*- 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 + +import os + +from builder.GadgetPackager import GadgetPackager + +gadgetsList = [ + "gadget_1bc7a418-569d-3b72-3463-ebfe5eb1442e", + "gadget_7e336960-94ea-6d50-31f7-38655786cb51", + "gadget_8dfa526b-b6e6-42b5-a913-634dbf04e19a", + "gadget_73b9a87c-1244-de8d-ef91-467db879e291", + "gadget_a11cd67a-4bae-bab6-d146-2429a97cd500", + "gadget_ee51da83-f96e-e265-e432-d009b927e5bd", +] + +# ============================================================================== +# Class to retrieve the py file path. +# ============================================================================== +class localFilePath(object): + """Class to retrieve the local file path. + """ + def getPath(self): + """Get the local file path. + """ + mPath, mFile = os.path.split(__file__) + return mPath + +if __name__ == "__main__": + basePath = localFilePath().getPath() + for gadget in gadgetsList: + GadgetPackager().createScg(os.path.join(basePath, gadget)) Added: software_suite_v3/software/gadget/online_only/trunk/builder/GadgetPackager.py =================================================================== --- software_suite_v3/software/gadget/online_only/trunk/builder/GadgetPackager.py (rev 0) +++ software_suite_v3/software/gadget/online_only/trunk/builder/GadgetPackager.py 2009-09-16 08:24:08 UTC (rev 5406) @@ -0,0 +1,67 @@ +# -*- 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 SCG file from the directory of a smart-core gadget. +# ------------------------------------------------------------------------------ +class GadgetPackager(object): + """Class to create a SCG file from the directory of a smart-core gadget. + """ + + # -------------------------------------------------------------------------- + # Create a scg file. + # -------------------------------------------------------------------------- + def createScg(self, scgDirectory): + """Create a scg file. + @param scgDirectory: Smart-Core gadget directory path. + @return: The success of the file creation. + """ + self.__sourcePath = os.path.realpath(scgDirectory) + if not os.path.isdir(self.__sourcePath): + return False + # Get some paths + TMP_BUILD_PATH = os.path.join(self.__sourcePath, "tmp") + DEST_SCG_FILENAME = self.__sourcePath + ".scg" + # Create the temporary build path + MKDirsF(TMP_BUILD_PATH) + # Copy the directory + CPDir(self.__sourcePath, TMP_BUILD_PATH) + # Filtering the content of temporary path + RMWithFilters(TMP_BUILD_PATH, filters = ['.svn',]) + # Create a zip file + directory = TMP_BUILD_PATH + last_cwd = os.getcwd() + os.chdir(TMP_BUILD_PATH) + zf = ZipFile(DEST_SCG_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/gadget/online_only/trunk/builder/__init__.py =================================================================== Added: software_suite_v3/software/gadget/online_only/trunk/builder/util/__init__.py =================================================================== Added: software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/DirectoriesAndFilesTools.py =================================================================== --- software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/DirectoriesAndFilesTools.py (rev 0) +++ software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/DirectoriesAndFilesTools.py 2009-09-16 08:24:08 UTC (rev 5406) @@ -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/gadget/online_only/trunk/builder/util/misc/__init__.py =================================================================== Added: software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/version.py =================================================================== --- software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/version.py (rev 0) +++ software_suite_v3/software/gadget/online_only/trunk/builder/util/misc/version.py 2009-09-16 08:24:08 UTC (rev 5406) @@ -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/gadget/online_only/trunk/builder/version.py =================================================================== --- software_suite_v3/software/gadget/online_only/trunk/builder/version.py (rev 0) +++ software_suite_v3/software/gadget/online_only/trunk/builder/version.py 2009-09-16 08:24:08 UTC (rev 5406) @@ -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.1' +author = "Remi Jocaille (rem...@c2...)" +licence = "GPL" +date = "2009" |
1 message has been excluded from this view by a project administrator.
