tux-droid-svn Mailing List for Tux Droid CE (Page 52)
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: ks156 <c2m...@c2...> - 2009-06-08 15:00:16
|
Author: ks156
Date: 2009-06-08 17:00:09 +0200 (Mon, 08 Jun 2009)
New Revision: 4755
Modified:
firmware/tuxcore/branches/demo/global.h
firmware/tuxcore/branches/demo/motors.c
Log:
* Adapted the compensation variables and reduce the scale factor
Modified: firmware/tuxcore/branches/demo/global.h
===================================================================
--- firmware/tuxcore/branches/demo/global.h 2009-06-08 14:11:20 UTC (rev 4754)
+++ firmware/tuxcore/branches/demo/global.h 2009-06-08 15:00:09 UTC (rev 4755)
@@ -32,8 +32,8 @@
#include "common/api.h"
#ifdef DEMO
-#define LEFT_COMP_CONT 8
-#define RIGHT_COMP_CONT -7
+#define LEFT_COMP_CONT 15
+#define RIGHT_COMP_CONT -11
#define LEFT_COMP LEFT_COMP_CONT
#define RIGHT_COMP RIGHT_COMP_CONT
#endif
Modified: firmware/tuxcore/branches/demo/motors.c
===================================================================
--- firmware/tuxcore/branches/demo/motors.c 2009-06-08 14:11:20 UTC (rev 4754)
+++ firmware/tuxcore/branches/demo/motors.c 2009-06-08 15:00:09 UTC (rev 4755)
@@ -266,7 +266,7 @@
if (motor == MOT_SPIN_L)
{
#ifdef DEMO
- spin_stop_delay = (value * 40);
+ spin_stop_delay = (value * 35);
spin_left(value, 2);
#else
spin_left(value, spin_params_pwm);
@@ -275,7 +275,7 @@
else
{
#ifdef DEMO
- spin_stop_delay = (value * 40);
+ spin_stop_delay = (value * 35);
spin_right(value, 2);
#else
spin_right(value, spin_params_pwm);
|
|
From: ks156 <c2m...@c2...> - 2009-06-08 14:11:23
|
Author: ks156
Date: 2009-06-08 16:11:20 +0200 (Mon, 08 Jun 2009)
New Revision: 4754
Modified:
firmware/tuxcore/branches/demo/Makefile
firmware/tuxcore/branches/demo/global.h
firmware/tuxcore/branches/demo/motors.c
firmware/tuxcore/branches/demo/standalone.c
Log:
* Modified the original code to adpat it for the demo, with :
- A reduced the spinning amplitude (about 30 degrees)
- A reduced the spinning speed (PWM duty cycle : 40%)
- An advanced braking function
This code can be compiled with 'make DEMO=yes'
Some compensation values are defined in global.h. The spinning gearbox is not
symetrical, so a compensation must be done to retrieve the initial position.
These values should probably adapted for a specific Tux.
Modified: firmware/tuxcore/branches/demo/Makefile
===================================================================
--- firmware/tuxcore/branches/demo/Makefile 2009-06-08 14:07:22 UTC (rev 4753)
+++ firmware/tuxcore/branches/demo/Makefile 2009-06-08 14:11:20 UTC (rev 4754)
@@ -51,6 +51,10 @@
# Place -D or -U options here
CDEFS = -DF_CPU=8000000UL
+ifneq (,$(findstring yes, $(DEMO)))
+ CDEFS += -DDEMO
+endif
+
# Place -I options here
CINCS =
Modified: firmware/tuxcore/branches/demo/global.h
===================================================================
--- firmware/tuxcore/branches/demo/global.h 2009-06-08 14:07:22 UTC (rev 4753)
+++ firmware/tuxcore/branches/demo/global.h 2009-06-08 14:11:20 UTC (rev 4754)
@@ -31,6 +31,13 @@
#include "common/defines.h"
#include "common/api.h"
+#ifdef DEMO
+#define LEFT_COMP_CONT 8
+#define RIGHT_COMP_CONT -7
+#define LEFT_COMP LEFT_COMP_CONT
+#define RIGHT_COMP RIGHT_COMP_CONT
+#endif
+
/*
* Custom types
*/
Modified: firmware/tuxcore/branches/demo/motors.c
===================================================================
--- firmware/tuxcore/branches/demo/motors.c 2009-06-08 14:07:22 UTC (rev 4753)
+++ firmware/tuxcore/branches/demo/motors.c 2009-06-08 14:11:20 UTC (rev 4754)
@@ -34,7 +34,11 @@
* \name Motors PWM
* @{ */
uint8_t flippers_params_pwm = 5;
+#ifdef DEMO
+uint8_t spin_params_pwm = 1;
+#else
uint8_t spin_params_pwm = 5;
+#endif
/*! @} */
/**
@@ -111,6 +115,9 @@
{
LEFT,
RIGHT,
+#ifdef DEMO
+ NDEF,
+#endif
};
/** Spinning direction */
static uint8_t spin_direction;
@@ -248,11 +255,32 @@
cnt = 0;
}
else
+ {
+#ifdef DEMO
+ duration_movement |= SPIN_FLAG;
+ cnt = 0;
+#else
cnt = value;
+#endif
+ }
if (motor == MOT_SPIN_L)
+ {
+#ifdef DEMO
+ spin_stop_delay = (value * 40);
+ spin_left(value, 2);
+#else
spin_left(value, spin_params_pwm);
+#endif
+ }
else
+ {
+#ifdef DEMO
+ spin_stop_delay = (value * 40);
+ spin_right(value, 2);
+#else
spin_right(value, spin_params_pwm);
+#endif
+ }
}
}
@@ -272,8 +300,13 @@
}
else if (motor == (MOT_SPIN_L) || motor == (MOT_SPIN_R))
{
+#ifdef DEMO
+ spin_params_pwm = 2;
+ spin_PWM = 2;
+#else
spin_params_pwm = pwm;
spin_PWM = pwm;
+#endif
}
}
/** Counter for flipper interrupt suspend. */
@@ -861,6 +894,9 @@
stop_spin_motor();
}
+#ifdef DEMO
+static volatile uint8_t pwm_spin_tim = 0;
+#endif
/**
\brief Spin left for the \c angle amount.
\param angle Angle to turn, in 90° unit.
@@ -870,11 +906,19 @@
void spin_left(uint8_t const angle, uint8_t const pwm)
{
gStatus.mot |= GSTATUS_MOT_SPINL;
+#ifndef DEMO
spin_move_counter = angle;
+#endif
/* If the rotation direction is changing and we are not stopped exactly on
* the switch (position switch not pressed), we need to increment the angle
* value to prevent counting the first switch detection that will happen as
* soon as the rotation starts. */
+#ifdef DEMO
+ if ((spin_direction == RIGHT))
+ spin_stop_delay += LEFT_COMP;
+ else
+ spin_stop_delay += LEFT_COMP_CONT;
+#else
if ((spin_direction == RIGHT) && (PSW_SPIN_PIN & PSW_SPIN_MK))
if (spin_move_counter)
spin_move_counter++;
@@ -882,9 +926,13 @@
if (!(duration_movement & SPIN_FLAG))
spin_stop_delay = SPIN_TIMEOUT;
spin_PWM = pwm;
+#endif
spin_PWM_mask &= ~MOT_SPIN_R_MK;
spin_PWM_mask |= MOT_SPIN_L_MK;
PORTB |= portB_PWM_mask;
+#ifdef DEMO
+ pwm_spin_tim = 0;
+#endif
}
/**
@@ -896,19 +944,33 @@
void spin_right(uint8_t const angle, uint8_t const pwm)
{
gStatus.mot |= GSTATUS_MOT_SPINR;
+#ifndef DEMO
spin_move_counter = angle;
+#endif
/* If the rotation direction is changing and we are not stopped exactly on
* the switch (position switch not pressed), we need to increment the angle
* value to prevent counting the first switch detection that will happen as
* soon as the rotation starts. */
+#ifdef DEMO
+ if ((spin_direction == LEFT))
+ spin_stop_delay += RIGHT_COMP;
+ else
+ spin_stop_delay += RIGHT_COMP_CONT;
+#else
if ((spin_direction == LEFT) && (PSW_SPIN_PIN & PSW_SPIN_MK))
if (spin_move_counter)
spin_move_counter++;
spin_direction = RIGHT;
+ /*if (!(duration_movement & SPIN_FLAG))*/
+ /*spin_stop_delay = SPIN_TIMEOUT;*/
spin_PWM = pwm;
+#endif
spin_PWM_mask &= ~MOT_SPIN_L_MK;
spin_PWM_mask |= MOT_SPIN_R_MK;
PORTB |= portB_PWM_mask;
+#ifdef DEMO
+ pwm_spin_tim = 0;
+#endif
}
/**
\brief Spin position interrupt.
@@ -921,6 +983,7 @@
*/
ISR(SIG_INTERRUPT1)
{
+#ifndef DEMO
if (spin_move_counter)
{
spin_move_counter--;
@@ -938,6 +1001,7 @@
spin_PWM_mask |= MOT_SPIN_L_MK;
}
}
+#endif
}
/*! @} */
@@ -965,16 +1029,27 @@
/* Spin PWM
* Pulse is stopped here */
+#ifdef DEMO
+ if (pwm_spin_tim == spin_PWM)
+#else
if (pwm_tim == spin_PWM)
+#endif
MOT_SPIN_PT &= ~MOT_SPIN_MK;
/* PWM motor management
* Pulse is set here when pwm_tim is at maximum and is
* reset when pwm_tim equals the PWM value set by the user
*/
+#ifdef DEMO
+ if (pwm_spin_tim++ == PWM_PERIOD)
+#else
if (pwm_tim++ == PWM_PERIOD)
+#endif
{
pwm_tim = 0;
+#ifdef DEMO
+ pwm_spin_tim = 0;
+#endif
PORTB |= portB_PWM_mask; /* spin and flippers */
}
@@ -1022,10 +1097,35 @@
/* spin motor timeout */
if (spin_stop_delay)
{
+#ifdef DEMO
+ static uint8_t stopping = 0;
+#endif
spin_stop_delay--;
if (!spin_stop_delay)
{
+#ifdef DEMO
+ if (spin_direction == LEFT && stopping == 0)
+ {
+ stopping = 1;
+ stop_spin_motor();
+ spin_stop_delay = SPIN_BRAKING_DLY;
+ spin_PWM_mask |= MOT_SPIN_R_MK;
+ }
+ else if (spin_direction == RIGHT && stopping == 0)
+ {
+ stopping = 1;
+ stop_spin_motor();
+ spin_stop_delay = SPIN_BRAKING_DLY;
+ spin_PWM_mask |= MOT_SPIN_L_MK;
+ }
+ else
+ {
+ stopping = 0;
+ stop_spinning();
+ }
+#else
stop_spinning();
+#endif
}
}
Modified: firmware/tuxcore/branches/demo/standalone.c
===================================================================
--- firmware/tuxcore/branches/demo/standalone.c 2009-06-08 14:07:22 UTC (rev 4753)
+++ firmware/tuxcore/branches/demo/standalone.c 2009-06-08 14:11:20 UTC (rev 4754)
@@ -193,7 +193,6 @@
void standalone_behavior(void)
{
- static uint8_t mov_nbr = 1;
uint8_t ir_command, ir_toggle;
if (event_manager_flag)
@@ -223,6 +222,7 @@
if (tux_config.ir_feedback)
leds_toggle(2, 4);
+#ifdef DEMO
/* ALT KEYS */
if (alt_mode)
{
@@ -250,64 +250,16 @@
{
switch (ir_command)
{
- case K_0:
- case K_1:
- case K_2:
- case K_3:
- case K_4:
- case K_5:
- case K_6:
- case K_7:
- case K_8:
- case K_9:
- mov_nbr = ir_command;
- break;
- case K_UP:
- blink_eyes(mov_nbr);
- break;
- case K_OK:
- move_mouth(mov_nbr);
- break;
- case K_DOWN:
- wave_flippers(mov_nbr, 5);
- break;
case K_LEFT:
- spin_left(mov_nbr, spin_PWM);
+ motors_config(MOT_SPIN_L, 2);
+ motors_run(MOT_SPIN_L, 1, 0);
break;
case K_RIGHT:
- spin_right(mov_nbr, spin_PWM);
+ motors_config(MOT_SPIN_R, 2);
+ motors_run(MOT_SPIN_R, 1, 0);
break;
- case K_STOP:
- stop_spinning();
- stop_flippers();
- stop_mouth();
- break;
- case K_MUTE:
- tux_config.ir_feedback = !tux_config.ir_feedback;
- break;
- case K_CHANNELPLUS:
- led_pulse(LED_RIGHT, 1, 0);
- break;
- case K_VOLUMEPLUS:
- led_pulse(LED_LEFT, 1, 0);
- break;
- case K_FASTREWIND:
- if (spin_PWM)
- spin_PWM--;
- break;
- case K_FASTFORWARD:
- if (spin_PWM < 5)
- spin_PWM++;
- break;
- case K_PREVIOUS:
- if (flippers_PWM)
- flippers_PWM--;
- break;
- case K_NEXT:
- if (flippers_PWM < 5)
- flippers_PWM++;
- break;
}
}
+#endif
}
}
|
|
From: ks156 <c2m...@c2...> - 2009-06-08 14:07:29
|
Author: ks156
Date: 2009-06-08 16:07:22 +0200 (Mon, 08 Jun 2009)
New Revision: 4753
Modified:
firmware/tuxaudio/branches/demo/Makefile
Log:
* Changed 'CUSTOMER' by 'DEMO' in the Makefile.
Modified: firmware/tuxaudio/branches/demo/Makefile
===================================================================
--- firmware/tuxaudio/branches/demo/Makefile 2009-06-08 06:46:57 UTC (rev 4752)
+++ firmware/tuxaudio/branches/demo/Makefile 2009-06-08 14:07:22 UTC (rev 4753)
@@ -47,7 +47,7 @@
CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
CFLAGS = $(COMMON) $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
CFLAGS += -MD -MP -MT $(*F).o -MF dep/$(@F).d
-ifneq (,$(findstring yes, $(CUSTOMER)))
+ifneq (,$(findstring yes, $(DEMO)))
CDEFS += -DCUSTOMER_INTERACT
endif
|
|
From: ks156 <c2m...@c2...> - 2009-06-08 06:47:07
|
Author: ks156
Date: 2009-06-08 08:46:57 +0200 (Mon, 08 Jun 2009)
New Revision: 4752
Modified:
firmware/tuxaudio/branches/demo/Makefile
firmware/tuxaudio/branches/demo/flash.c
firmware/tuxaudio/branches/demo/flash.h
firmware/tuxaudio/branches/demo/main.c
Log:
* Now start the embedded attitune by pushing the head button.
By default, the firmware will be compiled to starts the attitune
periodically. To allow the startup with the head button, the firmware must be
compiled with 'CUSTOMER=yes'
Modified: firmware/tuxaudio/branches/demo/Makefile
===================================================================
--- firmware/tuxaudio/branches/demo/Makefile 2009-06-05 11:45:53 UTC (rev 4751)
+++ firmware/tuxaudio/branches/demo/Makefile 2009-06-08 06:46:57 UTC (rev 4752)
@@ -47,7 +47,11 @@
CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
CFLAGS = $(COMMON) $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
CFLAGS += -MD -MP -MT $(*F).o -MF dep/$(@F).d
+ifneq (,$(findstring yes, $(CUSTOMER)))
+ CDEFS += -DCUSTOMER_INTERACT
+endif
+
## Assembly specific flags
ASMFLAGS = $(COMMON)
ASMFLAGS += -x assembler-with-cpp -Wa,-gstabs
@@ -187,7 +191,7 @@
# Programming
prog: $(PROJECT).hex
- tuxup -kr $(PROJECT).hex $(PROJECT).eep
+ tuxup $(PROJECT).hex $(PROJECT).eep
progisp: $(PROJECT).hex $(PROJECT).eep
$(AVRDUDE) -p $(MCU) -c jtag2isp -P usb -B 10 -e -U flash:w:$(PROJECT).hex -U eeprom:w:$(PROJECT).eep
Modified: firmware/tuxaudio/branches/demo/flash.c
===================================================================
--- firmware/tuxaudio/branches/demo/flash.c 2009-06-05 11:45:53 UTC (rev 4751)
+++ firmware/tuxaudio/branches/demo/flash.c 2009-06-08 06:46:57 UTC (rev 4752)
@@ -164,8 +164,11 @@
\ingroup flash
\brief Plays the sequence recorded in flash.
*/
-
+#ifdef CUSTOMER_INTERACT
+bool playSound(void)
+#else
void playSound(void)
+#endif
{
uint8_t cmd[CMD_SIZE];
@@ -185,6 +188,9 @@
}
bool exit = false;
+#ifdef CUSTOMER_INTERACT
+ bool end_of_cycle = false;
+#endif
while (!exit && !spi_start && !FifoFull(PWMFifo))
{
uint8_t data;
@@ -201,6 +207,9 @@
{
first_read = true;
exit = true;
+#ifdef CUSTOMER_INTERACT
+ end_of_cycle = true;
+#endif
}
else if (cmd[0] == WAIT_CMD)
{
@@ -217,6 +226,9 @@
FifoPut(PWMFifo, data);
}
}
+#ifdef CUSTOMER_INTERACT
+ return end_of_cycle;
+#endif
}
/**
Modified: firmware/tuxaudio/branches/demo/flash.h
===================================================================
--- firmware/tuxaudio/branches/demo/flash.h 2009-06-05 11:45:53 UTC (rev 4751)
+++ firmware/tuxaudio/branches/demo/flash.h 2009-06-08 06:46:57 UTC (rev 4752)
@@ -70,7 +70,11 @@
extern void init_programming(void);
extern void programming(void);
+#ifdef CUSTOMER_INTERACT
+extern bool playSound(void);
+#else
extern void playSound(void);
+#endif
extern void erase(void);
extern uint8_t checkFlashState(void);
extern uint8_t readLastBlock(uint8_t num);
Modified: firmware/tuxaudio/branches/demo/main.c
===================================================================
--- firmware/tuxaudio/branches/demo/main.c 2009-06-05 11:45:53 UTC (rev 4751)
+++ firmware/tuxaudio/branches/demo/main.c 2009-06-08 06:46:57 UTC (rev 4752)
@@ -38,6 +38,12 @@
#include "config.h"
#include "PC_communication.h"
+
+#ifdef CUSTOMER_INTERACT
+ /* Standalone mode : This flag indicate the end of a cycle */
+ volatile bool stopped = true;
+#endif
+
/*
* Debug and test flags
*/
@@ -70,6 +76,13 @@
/* XXX This ISR is declared as I think any interrupt which doesn't have an
* interrupt vector initialized will do a reset or infinite loop, this
* needs to be checked */
+
+ // Standalone code
+ //
+#ifdef CUSTOMER_INTERACT
+ /* Start a new cycle by pushing the HEAD button */
+ stopped = false;
+#endif
}
void sleep(void)
@@ -138,6 +151,13 @@
flashPlay = checkFlashState();
communication_init(); /* I2C initialization */
+#ifdef CUSTOMER_INTERACT
+ /* Set the Pin Change interrupt with PC3 */
+ PCMSK1 = 0x08;
+ PCIFR = _BV(PCIE1);
+ PCICR |= _BV(PCIE1);
+#endif
+
sei(); /* Init global interrupt */
@@ -168,13 +188,26 @@
erase();
else if (programmingFlash)
programming();
+
+#ifdef CUSTOMER_INTERACT
+ /* Don't read the flash memory if the cycle is over */
+ else if (!stopped)
+#else
+ /* Always read the flash memory */
else
+#endif
{
/* Send commands to I2C, otherwise get new status from tuxcore */
communication_task();
if (flashPlay && !silence)
+ {
+#ifdef CUSTOMER_INTERACT
+ stopped = playSound();
+#else
playSound();
+#endif
+ }
}
/*else if (sleep_f)*/
|
|
From: jerome <c2m...@c2...> - 2009-06-05 11:45:59
|
Author: jerome Date: 2009-06-05 13:45:53 +0200 (Fri, 05 Jun 2009) New Revision: 4751 Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas Log: * Updated application icon. Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu =================================================================== (Binary files differ) Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas =================================================================== --- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-06-05 11:23:26 UTC (rev 4750) +++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-06-05 11:45:53 UTC (rev 4751) @@ -105,8 +105,9 @@ Tray.UCallbackMessage := wm_AppelMessage; AppIcon := TIcon.Create; - ImageList1.GetIcon(4, AppIcon); + ImageList1.GetIcon(1, AppIcon); Application.Icon := AppIcon; + Form1.Icon := AppIcon; Tray.hIcon := Application.Icon.handle; Tray.szTip := 'Show/Hide Tux Droid Browser'; |
|
From: jerome <c2m...@c2...> - 2009-06-05 11:23:38
|
Author: jerome Date: 2009-06-05 13:23:26 +0200 (Fri, 05 Jun 2009) New Revision: 4750 Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Project2.cfg software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Project2.dof software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas Log: * Added a method to hide the browser scrollbar when it is not necessary. Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Project2.cfg =================================================================== --- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Project2.cfg 2009-06-05 09:33:43 UTC (rev 4749) +++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Project2.cfg 2009-06-05 11:23:26 UTC (rev 4750) @@ -1,35 +1 @@ --$A8 --$B- --$C+ --$D+ --$E- --$F- --$G+ --$H+ --$I+ --$J- --$K- --$L+ --$M- --$N+ --$O+ --$P+ --$Q- --$R- --$S- --$T- --$U- --$V+ --$W- --$X+ --$YD --$Z1 --cg --AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; --H+ --W+ --M --$M16384,1048576 --K$00400000 --LE"c:\program files\borland\delphi6\Projects\Bpl" --LN"c:\program files\borland\delphi6\Projects\Bpl" + |
|
From: ks156 <c2m...@c2...> - 2009-06-05 09:33:51
|
Author: ks156 Date: 2009-06-05 11:33:43 +0200 (Fri, 05 Jun 2009) New Revision: 4749 Added: firmware/tuxcore/branches/demo/ Log: * Created a new branch for the demo from the tag 0.5.2 Copied: firmware/tuxcore/branches/demo (from rev 4745, firmware/tuxcore/tags/0.5.2) |
|
From: jerome <c2m...@c2...> - 2009-06-04 14:41:41
|
Author: jerome Date: 2009-06-04 16:41:09 +0200 (Thu, 04 Jun 2009) New Revision: 4748 Added: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/tick_trans.png Log: * Added 'tick' icon. Added: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/tick_trans.png =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/tick_trans.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: jerome <c2m...@c2...> - 2009-06-04 14:39:13
|
Author: jerome
Date: 2009-06-04 16:39:01 +0200 (Thu, 04 Jun 2009)
New Revision: 4747
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Updated popup menu icons.
* Added event to do not minimize the window.
* Added a status bar.
* Changed task bar icon
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
===================================================================
(Binary files differ)
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-06-04 13:02:48 UTC (rev 4746)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-06-04 14:39:01 UTC (rev 4747)
@@ -1,8 +1,8 @@
object Form1: TForm1
- Left = 291
- Top = 127
- Width = 963
- Height = 634
+ Left = 302
+ Top = 27
+ Width = 1024
+ Height = 768
Caption = 'Tux Droid Browser'
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
@@ -55,11 +55,11 @@
object EmbeddedWB1: TEmbeddedWB
Left = 0
Top = 0
- Width = 955
- Height = 600
+ Width = 1016
+ Height = 715
Align = alClient
TabOrder = 0
- Silent = False
+ RegisterAsDropTarget = False
DisableCtrlShortcuts = 'N'
UserInterfaceOptions = [EnablesFormsAutoComplete, EnableThemes]
DisabledPopupMenus = [rcmAll]
@@ -75,6 +75,14 @@
8000000000000000000000000000000000000000000000000000000000000000
00000000000000000100000000000000000000000000000000000000}
end
+ object StatusBar1: TStatusBar
+ Left = 0
+ Top = 715
+ Width = 1016
+ Height = 19
+ Panels = <>
+ SimplePanel = False
+ end
object PopupMenu1: TPopupMenu
Images = PngImageList1
OnPopup = PopupMenu1Popup
@@ -82,17 +90,14 @@
Top = 8
object ShowHide1: TMenuItem
Caption = 'Show/Hide'
- ImageIndex = 4
OnClick = ShowHide1Click
end
object Mute1: TMenuItem
Caption = 'Mute'
- ImageIndex = 0
OnClick = Mute1Click
end
object Help1: TMenuItem
Caption = 'Help'
- ImageIndex = 3
OnClick = Help1Click
end
object N1: TMenuItem
@@ -100,7 +105,6 @@
end
object Quit1: TMenuItem
Caption = 'Quit'
- ImageIndex = 2
OnClick = Quit1Click
end
end
@@ -109,609 +113,103 @@
item
PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 61000000097048597300000B1300000B1301009A9C1800000A4F694343505068
- 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
- DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
- 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
- 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
- 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
- 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
- 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
- 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
- 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
- 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
- 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
- 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
- BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
- EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
- E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
- 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
- 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
- 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
- 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
- 44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
- 801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
- 3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
- 21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
- 46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
- 74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
- 6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
- 128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
- 51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
- 37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
- DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
- E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
- B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
- DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
- 197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
- 0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
- E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
- C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
- D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
- 744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
- AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
- 53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
- 4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
- 35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
- 8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
- 4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
- 6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
- A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
- 67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
- DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
- 1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
- 9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
- D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
- EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
- 7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
- F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
- 0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
- D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
- C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
- 17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
- 8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
- 91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
- 31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
- C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
- 2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
- B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
- 6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
- 1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
- 66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
- CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
- 61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
- FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
- D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
- F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
- 625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
- F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
- E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
- 9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
- DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
- D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
- 058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
- AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
- 1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
- D0A7FB93199393FF040398F3FC63332DDB000001484944415478DAA5D3CD2B44
- 5118C7F17B4B921A0B0B852CB0F0B2F1BEC042A2662259D8484AC846594A8AB2
- 903F80120B4A9195291B912C642199B09028B1929252F68CEF53BF3B1D37AFCD
- A94F9D3B67CEEFDEF33CF7FADEE7918F28C6501B5A3BC302F6F018FCE83B7F68
- C022EA75FD8027CDF350A87902A33875036CD33ACA70AFF901AEB45E8176F4A3
- 18379A272C200787A8C6358670EC7D3D1AB18A725CA0C5D78615DCA10F27CE86
- 0264E316592845041B28C1B0059CEBEEB3987636E7621F73D8420C1318C100A6
- EC292CE05D55EDC511E615D0843A74E3599D79C12B76B0695DB380A49E22A6AA
- 2743E7EE903764E808E3D845CD5F029AA5485DB39A4CBA01E1238403EC08ADC8
- D45A44454F1D215CC41E6DECC420BAD4B219855C2A2455C49FDAB8866DC451A5
- 1B2C61D96D63DA2F928DDF5EE54AB479DFBCCAC148EB630AC6BF3FE70FC87C61
- 8908A0FDEE0000000049454E44AE426082}
+ 6100000A4F6943435050686F746F73686F70204943432070726F66696C650000
+ 78DA9D53675453E9163DF7DEF4424B8880944B6F5215082052428B801491262A
+ 2109104A8821A1D91551C1114545041BC8A088038E8E808C15512C0C8A0AD807
+ E421A28E83A3888ACAFBE17BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C008
+ 0C9648335135800CA9421E11E083C7C4C6E1E42E40810A2470001008B3642173
+ FD230100F87E3C3C2B22C007BE000178D30B0800C04D9BC0301C87FF0FEA4299
+ 5C01808401C07491384B08801400407A8E42A600404601809D98265300A00400
+ 60CB6362E300502D0060277FE6D300809DF8997B01005B94211501A091002013
+ 65884400683B00ACCF568A450058300014664BC43900D82D00304957664800B0
+ B700C0CE100BB200080C00305188852900047B0060C8232378008499001446F2
+ 573CF12BAE10E72A00007899B23CB9243945815B082D710757572E1E28CE4917
+ 2B14366102619A402EC27999193281340FE0F3CC0000A0911511E083F3FD78CE
+ 0EAECECE368EB60E5F2DEABF06FF226262E3FEE5CFAB70400000E1747ED1FE2C
+ 2FB31A803B06806DFEA225EE04685E0BA075F78B66B20F40B500A0E9DA57F370
+ F87E3C3C45A190B9D9D9E5E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E
+ 3CFCF7F5E0BEE22481325D814704F8E0C2CCF44CA51CCF92098462DCE68F47FC
+ B70BFFFC1DD322C44962B9582A14E35112718E449A8CF332A52289429229C525
+ D2FF64E2DF2CFB033EDF3500B06A3E017B912DA85D6303F64B27105874C0E2F7
+ 0000F2BB6FC1D4280803806883E1CF77FFEF3FFD47A02500806649927100005E
+ 44242E54CAB33FC708000044A0812AB0411BF4C1182CC0061CC105DCC10BFC60
+ 36844224C4C24210420A64801C726029AC82422886CDB01D2A602FD4401D34C0
+ 51688693700E2EC255B80E3D700FFA61089EC128BC81090441C808136121DA88
+ 01628A58238E08179985F821C14804128B2420C9881451224B91354831528A54
+ 2055481DF23D720239875C46BA913BC8003282FC86BC47319481B2513DD40CB5
+ 43B9A8371A8446A20BD06474319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA
+ 8F3E43C730C0E8180733C46C302EC6C342B1382C099363CBB122AC0CABC61AB0
+ 56AC03BB89F563CFB17704128145C0093604774220611E4148584C584ED848A8
+ 201C243411DA093709038451C2272293A84BB426BA11F9C4186232318758482C
+ 23D6128F132F107B8843C437241289433227B9900249B1A454D212D246D26E52
+ 23E92CA99B34481A2393C9DA646BB20739942C202BC885E49DE4C3E433E41BE4
+ 21F25B0A9D624071A4F853E22852CA6A4A19E510E534E5066598324155A39A52
+ DDA8A15411358F5A42ADA1B652AF5187A81334759A39CD8316494BA5ADA295D3
+ 1A681768F769AFE874BA11DD951E4E97D057D2CBE947E897E803F4770C0D8615
+ 83C7886728199B18071867197718AF984CA619D38B19C754303731EB98E7990F
+ 996F55582AB62A7C1591CA0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB
+ 548FA95E537DAE46553353E3A909D496AB55AA9D50EB531B5367A93BA887AA67
+ A86F543FA47E59FD890659C34CC34F43A451A0B15FE3BCC6200B6319B3782C21
+ 6B0DAB86758135C426B1CDD97C762ABB98FD1DBB8B3DAAA9A13943334A3357B3
+ 52F394663F07E39871F89C744E09E728A797F37E8ADE14EF29E2291BA6344CB9
+ 31655C6BAA96979658AB48AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C7
+ 4A275C2747678FCE059DE753D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB44
+ 77BF6EA7EE989EBE5E809E4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C58
+ 06B30C2406DB0CCE183CC535716F3C1D2FC7DBF151435DC34043A561956197E1
+ 8491B9D13CA3D5468D460F8C69C65CE324E36DC66DC6A326062621264B4DEA4D
+ EE9A524DB9A629A63B4C3B4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79B
+ DFB7605A785A2CB6A8B6B86549B2E45AA659EEB6BC6E855A3959A558555A5DB3
+ 46AD9DAD25D6BBADBBA711A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D8
+ 06DBAEB66DB67D6167621767B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB
+ 1D5A1D7E73B472143A563ADE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B6
+ 13CB29C4699D539BD347671767B97383F3888B894B82CB2E973E2E9B1BC6DDC8
+ BDE44A74F5715DE17AD2F59D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F29
+ 9E593373D0C3C843E051E5D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F
+ 9157ADD7B0B7A577AAF761EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7
+ C8B7CB4FC36F9E5F85DF437F23FF64FF7AFFD100A78025016703898141815B02
+ FBF87A7C21BF8E3F3ADB65F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8
+ EC90AD21F7E798CE91CE690E85507EE8D6D00761E6618BC37E0C278587855786
+ 3F8E7088581AD131973577D1DC4373DF44FA449644DE9B67314F39AF2D4A352A
+ 3EAA2E6A3CDA37BA34BA3FC62E6659CCD5589D58496C4B1C392E2AAE366E6CBE
+ DFFCEDF387E29DE20BE37B17982FC85D7079A1CEC2F485A716A92E122C3A9640
+ 4C884E3894F041102AA8168C25F21377258E0A79C21DC267222FD136D188D843
+ 5C2A1E4EF2482A4D7A92EC91BC357924C533A52CE5B98427A990BC4C0D4CDD9B
+ 3A9E169A76206D323D3ABD31839291907142AA214D93B667EA67E66676CBAC65
+ 85B2FEC56E8BB72F1E9507C96BB390AC05592D0AB642A6E8545A28D72A07B267
+ 655766BFCD89CA3996AB9E2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5
+ 864B572D1D58E6BDAC6A39B23C7179DB0AE315052B865606AC3CB88AB62A6DD5
+ 4FABED5797AE7EBD267A4D6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED
+ 5D4F582F59DFB561FA869D1B3E15898AAE14DB1797157FD828DC78E51B876FCA
+ BF99DC94B4A9ABC4B964CF66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB4
+ 0DDF56B4EDF5F645DB2F97CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54
+ A454F454FA5436EED2DDB561D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BE
+ DB5501554DD566D565FB49FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D2
+ 03FD07230EB6D7B9D4D51DD23D54528FD62BEB470EC71FBEFE9DEF772D0D360D
+ 558D9CC6E223704479E4E9F709DFF71E0D3ADA768C7BACE107D31F761D671D2F
+ 6A429AF29A469B539AFB5B625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C5979
+ 4AF354C969DAE982D39367F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A
+ 0F6FEFBA1074E1D245FF8BE73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F
+ 6DEA74EA3CFE93D34FC7BB9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDD
+ F4BD79F116FFD6D59E393DDDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD977
+ 27EEADBC4FBC5FF440ED41D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47
+ F7068583CFFE91F58F0F43058F998FCB860D86EB9E383E3939E23F72FDE9FCA7
+ 43CF64CF269E17FEA2FECBAE17162F7EF8D5EBD7CED198D1A197F29793BF6D7C
+ A5FDEAC0EB19AFDBC6C2C61EBEC97833315EF456FBEDC177DC771DEFA3DF0F4F
+ E47C207F28FF68F9B1F553D0A7FB93199393FF040398F3FC63332DDB00000006
+ 624B474400FF00FF00FFA0BDA793000000097048597300000B1300000B130100
+ 9A9C180000000774494D45000000000000000973942E000001284944415478DA
+ A5D22D4803611CC7F1E71414C1248288CC3235C892C56A5F1988061918846950
+ D4BA64D0A6C16690812F283A652062512C06591908B398560483C1200716E7F7
+ F0F7C0C3C3CDC1F9870FDC3D2FBF7B5E2E30FFAC20C19C71A451C36B92806DCC
+ 630997ED02A2FEA69E87308B75A43087D3C019D8896F89AB02F634F643ABB8B2
+ 019358C02DCADEC43E7D35878CD33E830B1B90C751948845BCA9BD4303F7D1EB
+ 4C7EC61AEE6CC0344ED0857BACA28E2D850F3B938FB18317843620A7801EBD6F
+ A08A5D8CA92DC413367163CFCE5DC1B9961CD53BBED08F6EB55D63050DFF9A8C
+ 0E273AC42C46BD430CB5AD122A71F7EC5651FB76EB5177DE3031E5078C98DF9F
+ 65198338C3A1B3E7B601B60E30A5B0AAF9A35A054C60000FF84C12E08F69B6EA
+ FC01240D3712AFF555E00000000049454E44AE426082}
Name = 'PngImage0'
Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 61000000097048597300000B1300000B1301009A9C1800000A4F694343505068
- 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
- DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
- 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
- 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
- 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
- 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
- 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
- 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
- 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
- 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
- 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
- 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
- BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
- EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
- E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
- 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
- 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
- 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
- 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
- 44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
- 801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
- 3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
- 21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
- 46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
- 74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
- 6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
- 128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
- 51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
- 37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
- DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
- E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
- B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
- DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
- 197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
- 0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
- E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
- C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
- D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
- 744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
- AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
- 53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
- 4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
- 35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
- 8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
- 4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
- 6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
- A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
- 67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
- DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
- 1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
- 9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
- D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
- EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
- 7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
- F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
- 0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
- D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
- C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
- 17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
- 8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
- 91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
- 31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
- C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
- 2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
- B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
- 6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
- 1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
- 66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
- CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
- 61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
- FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
- D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
- F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
- 625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
- F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
- E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
- 9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
- DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
- D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
- 058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
- AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
- 1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
- D0A7FB93199393FF040398F3FC63332DDB000001614944415478DAA5D3BB2BC5
- 7118C7F1DF29290B8B9494DCCA657270CAE24E64302297854DF90394C931D8C9
- E4B2101B83C2603021274C2E0BD3A14E36613BBC9F7C4E3DE7E72CF2AD57E7FB
- FDFDCEF7F95E9EE71709B25B29FA318BA6D0BB2B2CE3182F998711F7871856D1
- A2711229F54B50A67E0233B8F4016CD2166AF1A4FE096EF5BE1EBD9840251ED4
- 4F5880429CA211F798C25968FBE5DA511B3651811B744434611D8F18C3456872
- 3356D0ADC9313DAFC2B405B8D6EA8B88A3C84DB6EDEEA340476A470F86316FBB
- B00069DDEA28F2B1E702D8C43CF55F15E04EBF3B96350BF0A55D0C287587C1EF
- F68E3E773796952344C301A27A116E495D643A57007F04CBC8418E00CFA8C1A7
- C65947F097B88B396523A53AE8D202D52E40DC5F62388D9318C1A0AACD820EA1
- 181F68C5B64FA32FA43765A213E75ACDC60B5852456EA0CE1792355FCAB6DDB5
- 20BB941B829F521E0F729472A6FDEB63CAB43F7FCEDFC43F5F89694216DD0000
- 000049454E44AE426082}
- Name = 'PngImage1'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 61000000097048597300000B1300000B1301009A9C1800000A4F694343505068
- 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
- DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
- 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
- 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
- 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
- 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
- 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
- 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
- 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
- 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
- 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
- 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
- BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
- EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
- E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
- 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
- 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
- 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
- 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
- 44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
- 801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
- 3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
- 21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
- 46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
- 74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
- 6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
- 128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
- 51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
- 37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
- DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
- E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
- B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
- DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
- 197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
- 0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
- E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
- C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
- D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
- 744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
- AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
- 53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
- 4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
- 35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
- 8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
- 4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
- 6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
- A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
- 67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
- DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
- 1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
- 9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
- D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
- EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
- 7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
- F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
- 0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
- D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
- C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
- 17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
- 8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
- 91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
- 31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
- C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
- 2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
- B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
- 6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
- 1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
- 66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
- CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
- 61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
- FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
- D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
- F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
- 625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
- F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
- E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
- 9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
- DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
- D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
- 058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
- AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
- 1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
- D0A7FB93199393FF040398F3FC63332DDB0000012D4944415478DAADD33F4B42
- 5118C7712F3598439842104EB9F4672A31A8C58682825E406581604D85635345
- 444D2D0D65B51804456FC0218786680851AA25A94527097C074158DF03BF0B37
- B981713BF08173EFB9E7B9E73CE73996EF67EBC30C3288B58C3DE20805BCDB2F
- 2DC7076338415CCF7534D4EF4544FD32D650720630932E31809AFAB7A8687C08
- D358463FDED42F9B00DDB8C3085E91C683CFBD4DE01C8378C6A4A50939549144
- 118B08E2149DD8415E63E3B842142B26C093FEBE8F6D2CE1185DD8D5B65278C1
- BA56BB872DB30A13A0A9AC2EE01E07D87024D28F303EB18A0B24706D4ECD04F8
- D22A6695F580963E879023501687F8D0A9DC60F45F0278DE825B12B39AD85612
- DD8E711E3D3843073655C2AEC7E8B990DA29E5614CFD56CA76F37499ECF6E7EB
- FC0DAD1568895D19B8C00000000049454E44AE426082}
- Name = 'PngImage2'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 61000000097048597300000B1300000B1301009A9C1800000A4F694343505068
- 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
- DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
- 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
- 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
- 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
- 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
- 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
- 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
- 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
- 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
- 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
- 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
- BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
- EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
- E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
- 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
- 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
- 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
- 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
- 44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
- 801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
- 3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
- 21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
- 46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
- 74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
- 6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
- 128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
- 51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
- 37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
- DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
- E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
- B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
- DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
- 197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
- 0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
- E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
- C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
- D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
- 744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
- AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
- 53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
- 4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
- 35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
- 8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
- 4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
- 6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
- A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
- 67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
- DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
- 1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
- 9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
- D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
- EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
- 7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
- F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
- 0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
- D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
- C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
- 17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
- 8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
- 91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
- 31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
- C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
- 2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
- B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
- 6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
- 1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
- 66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
- CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
- 61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
- FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
- D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
- F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
- 625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
- F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
- E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
- 9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
- DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
- D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
- 058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
- AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
- 1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
- D0A7FB93199393FF040398F3FC63332DDB0000014A4944415478DAA5D34F2B05
- 5118C7F1396F40B250B2B96C4816972836FE64C1929D64839D12365614B127CA
- 8E28B2BCEE8E85900572C34A6CB091F2228CEF73FB4D9D99EE8CE4D4A7CECC99
- F39CF33CE78C0BE2AD0E8398417B62EC1E5B38C567F4D2791F74621B1D7AFEC0
- 97FAB5A857BF8469DCF9016CD2019AF0A6FE9982B4A206398CA3012FEA972C40
- 152E91C73326718D6114BC1D3E62019B68D673AFD3841DBC620CB7611806CE39
- 5BB10FEF58D702F3B8C1211A3165011E34B886259B5CCECDF9E529079853800D
- AC62D176615F7DABAAA3B8AA10A05A75B1D6A61DF5E0C84ECDBE0AB58B21AB7A
- 850005D563027BDEA99C58C0DF02E4B4FA05FABD946201B252C82BFF7D6FF520
- 994256112DFF5914756C518B1531ED180355DE76708C114DEE4A1E63DA450A74
- 0FCEB18C157463377991B2AEF293C65B30907695A3F6AF9F296A7FFE9D7F0066
- BC7789C4D12EF10000000049454E44AE426082}
- Name = 'PngImage3'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 61000000097048597300000B1300000B1301009A9C1800000A4F694343505068
- 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
- DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
- 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
- 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
- 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
- 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
- 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
- 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
- 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
- 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
- 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
- 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
- BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
- EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
- E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
- 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
- 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
- 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
- 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
- 44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
- 801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
- 3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
- 21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
- 46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
- 74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
- 6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
- 128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
- 51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
- 37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
- DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
- E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
- B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
- DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
- 197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
- 0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
- E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
- C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
- D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
- 744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
- AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
- 53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
- 4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
- 35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
- 8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
- 4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
- 6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
- A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
- 67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
- DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
- 1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
- 9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
- D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
- EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
- 7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
- F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
- 0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
- D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
- C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
- 17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
- 8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
- 91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
- 31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
- C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
- 2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
- B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
- 6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
- 1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
- 66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
- CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
- 61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
- FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
- D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
- F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
- 625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
- F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
- E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
- 9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
- DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
- D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
- 058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
- AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
- 1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
- D0A7FB93199393FF040398F3FC63332DDB000001564944415478DAA5D3BF2BC5
- 5118C7F1FBCD4C31D0CD2077712F0B224C0AA5FC05888552C8603008835C6562
- 20941844F207DCC16030296E18E4C7C2243F1783D18FF7A9CFA9C7C98FE4A957
- F7DCFB3DCF73CF8FE71BC53E471CAD184275F0EC08F3D8C1ADFF3132136AB188
- 1A7DBFC183C68528D6388B011CDA022E690365B8D67817677A9E420BBA508A4B
- 8DB3AE401EF650890BF4603FF675BC6B4E1227688C94B08A2B74E200BD68428E
- 125FD1610AB9B90937CF1538D6BFA7B18C15DC611B754A980C0E7A10E36E15AE
- C09B4EB51F235857910CDA822DF46995735872C522EDCBADE21CCF3AE10A9C06
- C929EDDFDD54BE0EBCCA1698C630BA718F1793FC84125DE7166631EA0BF82DB4
- A30063EA091F1925E46ADF337854A1787888135A918F057D16E946D29A3F650F
- D15E63C224DB2EB5518F4D7B8D6123257F486EC05AD8482E7E6BE57234C7BE69
- 651FFF7A997CFCF975FE0095C45E89ACA7EBC10000000049454E44AE426082}
- Name = 'PngImage4'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 61000000097048597300000B1300000B1301009A9C1800000A4F694343505068
- 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7
- DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1
- 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1
- 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E
- 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0
- 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08
- 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027
- 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A
- 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00
- 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078
- 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279
- 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA
- BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225
- EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5
- E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D
- 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9
- 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35
- 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380
- 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000
- 44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64
- 801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E
- 3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8
- 21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C
- 46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064
- 74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4
- 6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704
- 128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384
- 51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4
- 37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9
- DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853
- E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1
- B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11
- DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867
- 197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA
- 0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353
- E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659
- C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD
- D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C
- 744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48
- AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7
- 53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E
- 4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5
- 35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F
- 8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B
- 4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8
- 6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711
- A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217
- 67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A
- DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767
- 1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5
- 9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5
- D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761
- EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43
- 7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65
- F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69
- 0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577
- D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F
- C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B
- 17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816
- 8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC
- 91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD
- 31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507
- C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E
- 2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39
- B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D
- 6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D
- 1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF
- 66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97
- CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5
- 61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49
- FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D
- D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9
- F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B
- 625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367
- F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B
- E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB
- 9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D
- DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41
- D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43
- 058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB
- AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6
- 1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553
- D0A7FB93199393FF040398F3FC63332DDB0000015B4944415478DAA5D3CD2B44
- 511CC671376B8A449385D8302CBC44582994E20F20B1F1B240169485BC6C0C59
- B15028B110C91F405950561A262CE465431662B061CFF5FDE9B975DD46D19CFA
- D4B973CF79E69CDF39D749F9D94268C2202A02EF4EB1803D3C7A3F3ABE015558
- 44A59E1FF0AC7E3672D58FA11F27FE009BB48142DCA9BF8F4BBD0FA3111DC8C7
- 8DFA310B48C721CA708D2E1CA5246EB5584311CE51E768C22A6ED18E6374A31E
- A99AF881038DABC6260A6C9C059CE9DF2358C60A9EB0ADC1D6A268552D7A3080
- 715B85057CAAAA7D18C1BA4276D0AC805DB4A057AB9CC7929D9A05B85AC515DE
- 54E1125C04F61F568DECA43254F0727FC03486D08938EE91A5C9AFC8D316B630
- 87512FC0DB421B32318619BC63580136214DFB9EC58B8242C1224EA01493AA7C
- 5C01393A9188C64FF98B183CC6A8EBBA092F81E37CDFBB9AE031267D91FE7295
- 8BD1F0DB55F65A521F93D7FEFD397F0116CA6789F5B7B6230000000049454E44
- AE426082}
- Name = 'PngImage5'
- Background = clWindow
end>
Left = 40
Top = 8
@@ -1130,7 +628,12 @@
end
object EwbControl1: TEwbControl
InternetFeatures = [Behaviors, DisableMkProtocol, GetUrlDomFilePathUnencoded]
- Left = 856
- Top = 424
+ Left = 136
+ Top = 8
end
+ object ApplicationEvents1: TApplicationEvents
+ OnMinimize = ApplicationEvents1Minimize
+ Left = 168
+ Top = 8
+ end
end
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-06-04 13:02:48 UTC (rev 4746)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-06-04 14:39:01 UTC (rev 4747)
@@ -29,7 +29,7 @@
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, OleCtrls, SHDocVw_EWB, EwbCore, EmbeddedWB, ShellAPI, Menus, Registry,
ImgList, PngImageList, LibXmlParser, LibXmlComps, IEDownload, ExtCtrls, TlHelp32,
- EwbControlComponent, TXmlThread;
+ EwbControlComponent, TXmlThread, ComCtrls, AppEvnts;
const wm_AppelMessage = wm_user + 1;
@@ -46,6 +46,8 @@
ImageList1: TImageList;
XmlScanner1: TXmlScanner;
EwbControl1: TEwbControl;
+ StatusBar1: TStatusBar;
+ ApplicationEvents1: TApplicationEvents;
procedure FormCreate(Sender: TObject);
procedure PopupMenu1Popup(Sender: TObject);
@@ -55,6 +57,7 @@
procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
procedure Mute1Click(Sender: TObject);
procedure XmlThreadTerminated(Sender: TObject);
+ procedure ApplicationEvents1Minimize(Sender: TObject);
private
{ Darations priv }
@@ -101,7 +104,7 @@
Tray.UCallbackMessage := wm_AppelMessage;
AppIcon := TIcon.Create;
- ImageList1.GetIcon(1, AppIcon);
+ ImageList1.GetIcon(4, AppIcon);
Application.Icon := AppIcon;
Tray.hIcon := Application.Icon.handle;
@@ -132,11 +135,18 @@
begin
CanClose := False;
ShowHide1.Caption := 'Show';
- ShowHide1.ImageIndex := 4;
Form1.Hide;
end;
+//Hiding the window in case of minimize request.
+procedure TForm1.ApplicationEvents1Minimize(Sender: TObject);
+begin
+ Application.Restore;
+ Form1.Hide;
+end;
+
+
{###############################################}
{####### Tray icon properties and events ######}
{###############################################}
@@ -156,13 +166,12 @@
begin
if Form1.Visible then
begin
- Form1.Hide;
- ShowHide1.ImageIndex := 4;
+ Form1.Visible := false;
+ SetForegroundWindow(Application.Handle);
end
else
begin
- Form1.Show;
- ShowHide1.ImageIndex := 5;
+ Form1.Visible := true;
end;
end;
@@ -185,7 +194,7 @@
end
else
begin
- Mute1.ImageIndex := 1;
+ Mute1.ImageIndex := -1;
end;
end;
@@ -252,15 +261,14 @@
//Showing application.
if Form1.Visible then
begin
- Form1.Hide;
+ Form1.Visible := false;
ShowHide1.Caption := 'Show';
- ShowHide1.ImageIndex := 4;
end
else
begin
- Form1.Show;
+ Form1.Visible := true;
ShowHide1.Caption := 'Hide';
- ShowHide1.ImageIndex := 5;
+ SetForegroundWindow(Application.Handle);
end;
end
|
|
From: jerome <c2m...@c2...> - 2009-06-04 13:03:03
|
Author: jerome Date: 2009-06-04 15:02:48 +0200 (Thu, 04 Jun 2009) New Revision: 4746 Removed: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/close.png software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/help.png software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/hide.png software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/mute.png software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/show.png software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/unmute.png Log: * Removed icons. Deleted: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/close.png =================================================================== (Binary files differ) Deleted: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/help.png =================================================================== (Binary files differ) Deleted: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/hide.png =================================================================== (Binary files differ) Deleted: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/mute.png =================================================================== (Binary files differ) Deleted: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/show.png =================================================================== (Binary files differ) Deleted: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/images/png/unmute.png =================================================================== (Binary files differ) |
|
From: jerome <c2m...@c2...> - 2009-06-04 10:38:34
|
Author: jerome Date: 2009-06-04 12:38:26 +0200 (Thu, 04 Jun 2009) New Revision: 4745 Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/nl/resources/gadget.xml Log: * Removed channels that doesn't work anymore. Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/nl/resources/gadget.xml =================================================================== --- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/nl/resources/gadget.xml 2009-06-04 07:55:22 UTC (rev 4744) +++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/nl/resources/gadget.xml 2009-06-04 10:38:26 UTC (rev 4745) @@ -18,9 +18,8 @@ category="Options" name="channel" description="Select your channel" - type="enum(Discovery Channel, EuroSport, - Film1+1, Film1.1, Film1.2, Film1.3, Film1HD, V8, Fox Kids, Kanaal Z, Nederland 1, Nederland 2, Nederland 3, - Net 5, National Geographic, RTL 5, RTL 7, RTL 4, SBS6, Sport1.1)" + type="enum(EuroSport, Film1+1, V8, Nederland 1, Nederland 2, Nederland 3, + Net 5, RTL 5, RTL 7, RTL 4, SBS6, Sport1.1)" defaultValue="RTL 5" /> <parameter category="Options" |
|
From: jerome <c2m...@c2...> - 2009-06-04 07:55:40
|
Author: jerome
Date: 2009-06-04 09:55:22 +0200 (Thu, 04 Jun 2009)
New Revision: 4744
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.dcu
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Code cleanup.
* Removed unused object.
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.dcu
===================================================================
(Binary files differ)
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas 2009-06-04 07:24:04 UTC (rev 4743)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas 2009-06-04 07:55:22 UTC (rev 4744)
@@ -31,7 +31,7 @@
TXmlThreadObject = class(TThread)
public
- constructor create(scanner : TXmlScanner);
+ constructor create(var scanner : TXmlScanner);
destructor destroy; override;
function getResult() : boolean;
@@ -51,7 +51,7 @@
{ TXmlThread }
-constructor TXmlThreadObject.create(scanner : TXmlScanner);
+constructor TXmlThreadObject.create(var scanner : TXmlScanner);
begin
inherited create(true);
xmlScanner := scanner;
@@ -63,6 +63,7 @@
destructor TXmlThreadObject.destroy;
begin
inherited;
+ //xmlScanner.Free;
end;
procedure TXmlThreadObject.Execute;
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
===================================================================
(Binary files differ)
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-06-04 07:24:04 UTC (rev 4743)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-06-04 07:55:22 UTC (rev 4744)
@@ -1123,14 +1123,9 @@
C21FC21FC21FC21FFFFFFFFFFFFFFFFF00000000000000000000000000000000
000000000000}
end
- object Timer1: TTimer
- Interval = 3000
- Left = 104
- Top = 8
- end
object XmlScanner1: TXmlScanner
Normalize = True
- Left = 136
+ Left = 104
Top = 8
end
object EwbControl1: TEwbControl
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-06-04 07:24:04 UTC (rev 4743)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-06-04 07:55:22 UTC (rev 4744)
@@ -44,7 +44,6 @@
Quit1: TMenuItem;
PngImageList1: TPngImageList;
ImageList1: TImageList;
- Timer1: TTimer;
XmlScanner1: TXmlScanner;
EwbControl1: TEwbControl;
@@ -343,6 +342,7 @@
self.XmlScanner1.LoadFromFile(xmlFile);
xmlThread := TXmlThreadObject.create(self.XmlScanner1);
+
xmlThread.Resume;
boolValue := xmlThread.getResult();
@@ -362,7 +362,21 @@
ImageList1.GetIcon(3, AppIcon);
Tray.hIcon := AppIcon.Handle;
Shell_NotifyIcon(Nim_Modify, @tray);
+ end
+ else
+ begin
+ ImageList1.GetIcon(1, AppIcon);
+ Tray.hIcon := AppIcon.Handle;
+ Shell_NotifyIcon(Nim_Modify, @tray);
end;
+
+ Try
+ TXmlThreadObject(sender).Free;
+ TXmlThreadObject(sender).destroy;
+ Except
+
+ end;
+
end;
end.
|
|
From: jerome <c2m...@c2...> - 2009-06-04 07:24:13
|
Author: jerome
Date: 2009-06-04 09:24:04 +0200 (Thu, 04 Jun 2009)
New Revision: 4743
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvNl.java
Log:
* Fixed a bug with the Netherland one.
Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvNl.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvNl.java 2009-06-03 14:21:18 UTC (rev 4742)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvNl.java 2009-06-04 07:24:04 UTC (rev 4743)
@@ -30,22 +30,21 @@
public class GadgetProgramsTvNl extends SimpleGadget<Configuration> implements ProgramLoadListener{
- SimplePrograms nlPrograms;
+ SimplePrograms nl;
-
/**
- * Handle programs load errors.
+ * Constructor.
*/
@Override
- public void loadError(String url)
+ protected void start() throws Throwable
{
configuration().setTHour(configuration().getTHour());
if(configuration().getGiveAfternoon() || configuration().getGiveEvening() ||
configuration().getGiveMorning() || configuration().getGiveNowPlaying())
{
- throwMessage("Error while loading the TV program");
- GadgetProgramTV.quitGadget();
+ SimplePrograms.addProgramLoadListener(this);
+ nl = new SimplePrograms(SimplePrograms.Nl, this.configuration().getChannel());
}
else
{
@@ -53,38 +52,38 @@
GadgetProgramTV.quitGadget();
}
}
+
+ /**
+ * Handle error while loading the tv program.
+ */
+ @Override
+ public void loadError(String url)
+ {
+ throwMessage("Error while loading the TV program");
+ GadgetProgramTV.quitGadget();
+ }
+
/**
- * Handle program loaded event.
+ *Notify that the program is charged.
*/
@Override
- public void loaded(Vector<Program> completeProgram)
+ public void loaded(Vector<Program> completeProgram)
{
try
{
GadgetProgramTV.giveProgram(this.configuration(), completeProgram, this);
}
- catch(Exception errors)
+ catch(Exception error)
{
- this.loadError(null);
+ ;
}
}
-
- /**
- * Gadget entry point.
- */
- @Override
- protected void start() throws Throwable
- {
- SimplePrograms.addProgramLoadListener(this);
- nlPrograms = new SimplePrograms(SimplePrograms.Nl, this.configuration().getChannel());
- }
-
/**
- * Main point entry.
+ * Main entry point.
* @param args
*/
public static void main(String[] args)
|
|
From: remi <c2m...@c2...> - 2009-06-03 14:33:29
|
Author: remi Date: 2009-06-03 15:32:28 +0200 (Wed, 03 Jun 2009) New Revision: 4740 Added: software_suite_v3/smart-core/smart-server/trunk/resources/04_robot_content_interactions/ software_suite_v3/smart-core/smart-server/trunk/resources/05_user_configurations/ software_suite_v3/smart-core/smart-server/trunk/resources/06_updates/ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/ Removed: software_suite_v3/smart-core/smart-server/trunk/resources/04_user_configurations/ software_suite_v3/smart-core/smart-server/trunk/resources/05_updates/ software_suite_v3/smart-core/smart-server/trunk/resources/06_web_interfaces/ Log: * added resource layer "robot_content_interactions" Copied: software_suite_v3/smart-core/smart-server/trunk/resources/05_user_configurations (from rev 4704, software_suite_v3/smart-core/smart-server/trunk/resources/04_user_configurations) Copied: software_suite_v3/smart-core/smart-server/trunk/resources/06_updates (from rev 4704, software_suite_v3/smart-core/smart-server/trunk/resources/05_updates) Copied: software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces (from rev 4704, software_suite_v3/smart-core/smart-server/trunk/resources/06_web_interfaces) |
|
From: jerome <c2m...@c2...> - 2009-06-03 14:21:49
|
Author: jerome
Date: 2009-06-03 16:21:18 +0200 (Wed, 03 Jun 2009)
New Revision: 4742
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas
Log:
* Added header on XmlThread object.
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas 2009-06-03 14:13:35 UTC (rev 4741)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas 2009-06-03 14:21:18 UTC (rev 4742)
@@ -1,3 +1,25 @@
+{* This file is part of "Tux Droid Browser".
+ * Copyright 2009, kysoh
+ * Author : Conan Jerome.
+ * eMail : jer...@ky...
+ * Site : http://www.kysoh.com/
+ *
+ * "Tux Droid Browser" 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.1 of
+ * the License, or (at your option) any later version.
+ *
+ * "Tux Droid Browser" 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 "Tux Droid Browser"; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *}
+
unit TXmlThread;
interface
|
|
From: jerome <c2m...@c2...> - 2009-06-03 14:16:31
|
Author: jerome
Date: 2009-06-03 16:13:35 +0200 (Wed, 03 Jun 2009)
New Revision: 4741
Added:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.dcu
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas
Modified:
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Project2.dpr
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Added xml parser to retrieve dongle connection state.
* Start command in a thread.
* Cleanup.
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Project2.dpr
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Project2.dpr 2009-06-03 13:32:28 UTC (rev 4740)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Project2.dpr 2009-06-03 14:13:35 UTC (rev 4741)
@@ -2,7 +2,8 @@
uses
Forms,
- Unit1 in 'Unit1.pas' {Form1};
+ Unit1 in 'Unit1.pas' {Form1},
+ TXmlThread in 'TXmlThread.pas';
{$R *.res}
Added: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.dcu
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.dcu
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas (rev 0)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas 2009-06-03 14:13:35 UTC (rev 4741)
@@ -0,0 +1,79 @@
+unit TXmlThread;
+
+interface
+
+uses
+ Classes, LibXmlParser, LibXmlComps, SysUtils, Windows, Dialogs;
+
+type
+ TXmlThreadObject = class(TThread)
+
+ public
+ constructor create(scanner : TXmlScanner);
+ destructor destroy; override;
+ function getResult() : boolean;
+
+ private
+ { Darations priv }
+ procedure XmlScanner1Content(Sender: TObject; Content: String);
+
+ protected
+ procedure Execute; override;
+ end;
+
+var
+ xmlScanner : TXmlScanner;
+ boolValue : boolean;
+
+implementation
+
+{ TXmlThread }
+
+constructor TXmlThreadObject.create(scanner : TXmlScanner);
+begin
+ inherited create(true);
+ xmlScanner := scanner;
+ xmlScanner.OnContent := self.XmlScanner1Content;
+ boolValue := false;
+end;
+
+
+destructor TXmlThreadObject.destroy;
+begin
+ inherited;
+end;
+
+procedure TXmlThreadObject.Execute;
+begin
+ xmlScanner.Execute;
+end;
+
+
+//Xml scanner event.
+procedure TXmlThreadObject.XmlScanner1Content(Sender: TObject; Content: String);
+var
+ parser : TXmlParser;
+ value : String;
+begin
+ parser := TXmlScanner(sender).XmlParser;
+
+ if parser.CurName = 'value' then
+ begin
+ value := LowerCase(parser.CurContent);
+ if value = 'true' then
+ boolValue := true
+ else
+ boolValue := false;
+ end;
+
+end;
+
+
+//Return the thread Result.
+function TXmlThreadObject.getResult() : boolean;
+begin
+ Result := boolValue;
+end;
+
+end.
+
\ No newline at end of file
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
===================================================================
(Binary files differ)
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-06-03 13:32:28 UTC (rev 4740)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm 2009-06-03 14:13:35 UTC (rev 4741)
@@ -59,6 +59,7 @@
Height = 600
Align = alClient
TabOrder = 0
+ Silent = False
DisableCtrlShortcuts = 'N'
UserInterfaceOptions = [EnablesFormsAutoComplete, EnableThemes]
DisabledPopupMenus = [rcmAll]
@@ -719,7 +720,7 @@
Left = 72
Top = 8
Bitmap = {
- 494C010105000900040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
+ 494C010105000900040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
0000000000003600000028000000400000003000000001002000000000000030
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1119,11 +1120,22 @@
F00FF00FF00FF00FF007F007F007F007E003E003E003E003E001E001E001E001
C001C001C001C001C000C000C000C00080008000800080008000800080008000
8000800080008000800080008000800080008000800080008001800180018001
- C21FC21FC21FC21FFFFFFFFFFFFFFFFF}
+ C21FC21FC21FC21FFFFFFFFFFFFFFFFF00000000000000000000000000000000
+ 000000000000}
end
object Timer1: TTimer
Interval = 3000
Left = 104
Top = 8
end
+ object XmlScanner1: TXmlScanner
+ Normalize = True
+ Left = 136
+ Top = 8
+ end
+ object EwbControl1: TEwbControl
+ InternetFeatures = [Behaviors, DisableMkProtocol, GetUrlDomFilePathUnencoded]
+ Left = 856
+ Top = 424
+ end
end
Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-06-03 13:32:28 UTC (rev 4740)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas 2009-06-03 14:13:35 UTC (rev 4741)
@@ -28,7 +28,8 @@
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, OleCtrls, SHDocVw_EWB, EwbCore, EmbeddedWB, ShellAPI, Menus, Registry,
- ImgList, PngImageList, LibXmlParser, LibXmlComps, IEDownload, ExtCtrls, TlHelp32;
+ ImgList, PngImageList, LibXmlParser, LibXmlComps, IEDownload, ExtCtrls, TlHelp32,
+ EwbControlComponent, TXmlThread;
const wm_AppelMessage = wm_user + 1;
@@ -44,6 +45,8 @@
PngImageList1: TPngImageList;
ImageList1: TImageList;
Timer1: TTimer;
+ XmlScanner1: TXmlScanner;
+ EwbControl1: TEwbControl;
procedure FormCreate(Sender: TObject);
procedure PopupMenu1Popup(Sender: TObject);
@@ -52,13 +55,16 @@
procedure Help1Click(Sender: TObject);
procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
procedure Mute1Click(Sender: TObject);
+ procedure XmlThreadTerminated(Sender: TObject);
private
{ Darations priv }
procedure WMAppelMessage(var msg : TMessage); message wm_AppelMessage;
function OpenUrl(const url : String) : boolean;
+
function isTuxDroidServerStarted() : boolean;
+ function isDongleConnected() : boolean;
public
{ Darations publiques }
@@ -70,8 +76,8 @@
Tray : TNotifyIconData;
AppIcon : TIcon;
serverStarted : boolean;
+ radioState : boolean;
-
implementation
{$R *.dfm}
@@ -83,8 +89,11 @@
//Form initialization.
procedure TForm1.FormCreate(Sender: TObject);
+var
+ inputValue : String;
begin
url := 'http://127.0.0.1:270/devel/';
+ radioState := false;
//Tray icon initialization.
Tray.cbSize := SizeOf(Tray);
@@ -106,6 +115,7 @@
//Embedded browser initialization.
EmbeddedWB1.Go(url);
+ //Changing tray icon if server isn't started or no radio detected.
if ( not isTuxDroidServerStarted() ) then
begin
ImageList1.GetIcon(3, AppIcon);
@@ -113,6 +123,8 @@
Shell_NotifyIcon(Nim_Modify, @tray);
end;
+ isDongleConnected();
+
end;
@@ -120,6 +132,8 @@
procedure TForm1.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
begin
CanClose := False;
+ ShowHide1.Caption := 'Show';
+ ShowHide1.ImageIndex := 4;
Form1.Hide;
end;
@@ -238,9 +252,18 @@
begin
//Showing application.
if Form1.Visible then
- Form1.Hide
+ begin
+ Form1.Hide;
+ ShowHide1.Caption := 'Show';
+ ShowHide1.ImageIndex := 4;
+ end
else
+ begin
Form1.Show;
+ ShowHide1.Caption := 'Hide';
+ ShowHide1.ImageIndex := 5;
+ end;
+
end
else if msg.LParam = Wm_RButtonDown then
begin
@@ -284,5 +307,63 @@
end;
+
+function TForm1.isDongleConnected() : boolean;
+var
+ targetDir : String;
+ downloaded : boolean;
+ xmlFile : TFileName;
+ xmlThread : TXmlThreadObject;
+
+const
+ command = 'http://127.0.0.1:270/0/status/request_one?status_name=radio_state';
+ fileName = 'radio.xml';
+
+begin
+
+ targetDir := ExtractFilePath(Application.ExeName);
+ downloaded := false;
+
+ //Checking if file exists and remove it.
+ if FileExists(targetDir + '\' + fileName) then
+ begin
+ DeleteFile(fileName);
+ end;
+
+ Try
+ downloaded := self.EmbeddedWB1.DownloadFile(command, targetDir + '\' + fileName);
+ Except
+ ShowMessage('Error while retrieving dongle state');
+ end;
+
+ //Getting result.
+ if downloaded then
+ begin
+ xmlFile := targetDir + '\' + fileName;
+ self.XmlScanner1.LoadFromFile(xmlFile);
+
+ xmlThread := TXmlThreadObject.create(self.XmlScanner1);
+ xmlThread.Resume;
+
+ boolValue := xmlThread.getResult();
+ xmlThread.OnTerminate := Form1.XmlThreadTerminated;
+ end;
+
+ DeleteFile(targetDir + '\' + fileName);
+ Result := boolValue;
+
+end;
+
+
+procedure TForm1.XmlThreadTerminated(Sender: TObject);
+begin
+ if ( not boolValue ) then
+ begin
+ ImageList1.GetIcon(3, AppIcon);
+ Tray.hIcon := AppIcon.Handle;
+ Shell_NotifyIcon(Nim_Modify, @tray);
+ end;
+end;
+
end.
|
|
From: remi <c2m...@c2...> - 2009-06-03 13:18:48
|
Author: remi Date: 2009-06-03 15:18:42 +0200 (Wed, 03 Jun 2009) New Revision: 4739 Modified: software_suite_v3/smart-core/smart-server/trunk/util/osl/libtuxosl.dll Log: * fixed libtuxosl.dll with the new registry keys Modified: software_suite_v3/smart-core/smart-server/trunk/util/osl/libtuxosl.dll =================================================================== (Binary files differ) |
|
From: remi <c2m...@c2...> - 2009-06-03 12:51:05
|
Author: remi Date: 2009-06-03 14:50:57 +0200 (Wed, 03 Jun 2009) New Revision: 4738 Added: software_suite_v3/software/plugin/plugin-clock/ software_suite_v3/software/plugin/plugin-clock/branches/ software_suite_v3/software/plugin/plugin-clock/tags/ software_suite_v3/software/plugin/plugin-clock/trunk/ software_suite_v3/software/plugin/plugin-clock/trunk/LICENSE software_suite_v3/software/plugin/plugin-clock/trunk/dos.bat software_suite_v3/software/plugin/plugin-clock/trunk/pom.xml software_suite_v3/software/plugin/plugin-clock/trunk/resources/ software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.wiki software_suite_v3/software/plugin/plugin-clock/trunk/resources/help.wiki software_suite_v3/software/plugin/plugin-clock/trunk/resources/icon.png software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.pot software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.xml software_suite_v3/software/plugin/plugin-clock/trunk/sources/ software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/ software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/ software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/ software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java Log: * added "clock" plugin as real example which work with the current server. Added: software_suite_v3/software/plugin/plugin-clock/trunk/LICENSE =================================================================== --- software_suite_v3/software/plugin/plugin-clock/trunk/LICENSE (rev 0) +++ software_suite_v3/software/plugin/plugin-clock/trunk/LICENSE 2009-06-03 12:50:57 UTC (rev 4738) @@ -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/plugin-clock/trunk/dos.bat =================================================================== --- software_suite_v3/software/plugin/plugin-clock/trunk/dos.bat (rev 0) +++ software_suite_v3/software/plugin/plugin-clock/trunk/dos.bat 2009-06-03 12:50:57 UTC (rev 4738) @@ -0,0 +1 @@ +cmd \ No newline at end of file Property changes on: software_suite_v3/software/plugin/plugin-clock/trunk/dos.bat ___________________________________________________________________ Name: svn:keywords + Id Added: software_suite_v3/software/plugin/plugin-clock/trunk/pom.xml =================================================================== --- software_suite_v3/software/plugin/plugin-clock/trunk/pom.xml (rev 0) +++ software_suite_v3/software/plugin/plugin-clock/trunk/pom.xml 2009-06-03 12:50:57 UTC (rev 4738) @@ -0,0 +1,115 @@ +<project> + <!--General project informations--> + <modelVersion>4.0.0</modelVersion> + <groupId>com.kysoh</groupId> + <artifactId>plugin-clock</artifactId> + <packaging>jar</packaging> + <version>2.0</version> + <name>Clock plugin for Tux Droid</name> + <url>http://www.kysoh.com</url> + + <!--Dependency list--> + <dependencies> + <dependency> + <groupId>com.kysoh</groupId> + <artifactId>tuxdroid-plugin-java-kit</artifactId> + <version>0.0.3</version> + </dependency> + </dependencies> + + <!--Repository list--> + <repositories> + <repository> + <id>kysoh</id> + <name>Kysoh Repository</name> + <layout>default</layout> + <url>http://ftp.kysoh.com/maven2</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + <!--Build process--> + <build> + <sourceDirectory>sources</sourceDirectory> + <plugins> + + <!--This section copy the dependencies into ./libraries--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>./libraries</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <!--This plugin run small ant scripts to pack and clean the gadget --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + + <!--This section create the .tgf file during the package lifecycle--> + <execution> + <phase>package</phase> + <id>package</id> + <configuration> + <tasks> + <mkdir dir="./libraries"/> + <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" + todir="./libraries" /> + <zip destfile="./${project.artifactId}.scp"> + <zipfileset dir="." includes="resources/*" /> + <zipfileset dir="." includes="libraries/*" > + <exclude name="libraries/tuxdroid-plugin-java-kit*" /> + <exclude name="libraries/karmalab-commons*" /> + <exclude name="libraries/tuxdroid-java-api*" /> + </zipfileset> + <zipfileset dir="." includes="executables/*" /> + </zip> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle--> + <execution> + <phase>clean</phase> + <configuration> + <tasks> + <delete dir="./libraries"/> + <delete file="./${project.artifactId}.scp"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <!--This plugin compile the project--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> +</project> Property changes on: software_suite_v3/software/plugin/plugin-clock/trunk/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Added: software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po (rev 0) +++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po 2009-06-03 12:50:57 UTC (rev 4738) @@ -0,0 +1,14 @@ +msgid "Clock" +msgstr "Horloge" + +msgid "Clock." +msgstr "Horloge." + +msgid "Ce plugin vous donne l'heure." +msgstr "" + +msgid "Current time is {0} hours and {1} minutes." +msgstr "Il est {0} heures et {1} minutes." + +msgid "Current time is {0} hours." +msgstr "Il est {0} heures." Property changes on: software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po ___________________________________________________________________ Name: svn:keywords + Id Added: software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.wiki 2009-06-03 12:50:57 UTC (rev 4738) @@ -0,0 +1,2 @@ += Synopsis = +Ce plugin ajoute ux Droid la faculte vous donner l'heure. Property changes on: software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.wiki ___________________________________________________________________ Name: svn:keywords + Id Added: software_suite_v3/software/plugin/plugin-clock/trunk/resources/help.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-clock/trunk/resources/help.wiki (rev 0) +++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/help.wiki 2009-06-03 12:50:57 UTC (rev 4738) @@ -0,0 +1,2 @@ += Synopsis = +This plugin will make Tux Droid say the time. Property changes on: software_suite_v3/software/plugin/plugin-clock/trunk/resources/help.wiki ___________________________________________________________________ Name: svn:keywords + Id Added: software_suite_v3/software/plugin/plugin-clock/trunk/resources/icon.png =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/plugin/plugin-clock/trunk/resources/icon.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:keywords + Id Added: software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.pot (rev 0) +++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.pot 2009-06-03 12:50:57 UTC (rev 4738) @@ -0,0 +1,14 @@ +msgid "Clock" +msgstr "" + +msgid "Clock." +msgstr "" + +msgid "This plugin gives you the time." +msgstr "" + +msgid "Current time is {0} hours and {1} minutes." +msgstr "" + +msgid "Current time is {0} hours." +msgstr "" Property changes on: software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.pot ___________________________________________________________________ Name: svn:keywords + Id Added: software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.xml =================================================================== --- software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.xml (rev 0) +++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.xml 2009-06-03 12:50:57 UTC (rev 4738) @@ -0,0 +1,155 @@ +<plugin> + <interpreter + kind="java"> + <executable>net.karmaLab.tuxDroid.plugins.ClockPlugin</executable> + </interpreter> + <description> + <name>Clock</name> + <ttsName>Clock.</ttsName> + <description>This plugin gives you the time.</description> + <author>Yoran Brault</author> + <version>0.2.0</version> + <iconFile>resources/icon.png</iconFile> + <uuid>8349ed52-572d-4c3f-a7b8-05c2a8aec2c0</uuid> + <platform>all</platform> + </description> + <parameters/> + <commands> + <command + name="run" + description="Give the time" + daemon="false" /> + </commands> + <tasks> + <task + name="Start every x" + description="Start me every x" + command="run" + type="every x" + activated="false" + + weekMask="true,true,true,true,true,true,true" + weekMaskType="flat" + weekMaskVisible="true" + + date="0000/00/00" + dateVisible="false" + + hoursBegin="00:00:00" + hoursBeginMask="true,true,true" + hoursBeginVisible="true" + + hoursEnd="23:59:00" + hoursEndMask="true,true,true" + hoursEndVisible="true" + + delay="00:01:00" + delayMask="true,true,true" + delayVisible="true" + /> + <task + name="Start every x from full hour" + description="Start me every x (From full hour)" + command="run" + type="every x from full hour" + activated="false" + + weekMask="true,true,true,true,true,true,true" + weekMaskType="flat" + weekMaskVisible="true" + + date="0000/00/00" + dateVisible="false" + + hoursBegin="00:00:00" + hoursBeginMask="true,true,true" + hoursBeginVisible="true" + + hoursEnd="23:59:00" + hoursEndMask="true,true,true" + hoursEndVisible="true" + + delay="00:01:00" + delayMask="true,true,true" + delayVisible="true" + /> + <task + name="Start daily at" + description="Start me daily" + command="run" + type="daily at" + activated="false" + + weekMask="true,true,true,true,true,true,true" + weekMaskType="flat" + weekMaskVisible="true" + + date="0000/00/00" + dateVisible="false" + + hoursBegin="00:00:00" + hoursBeginMask="true,true,true" + hoursBeginVisible="true" + + hoursEnd="23:59:00" + hoursEndMask="true,true,true" + hoursEndVisible="true" + + delay="00:01:00" + delayMask="true,true,true" + delayVisible="false" + /> + <task + name="Start once at" + description="Start me once time" + command="run" + type="once at" + activated="false" + + weekMask="true,true,true,true,true,true,true" + weekMaskType="flat" + weekMaskVisible="false" + + date="2009/01/01" + dateVisible="true" + + hoursBegin="00:00:00" + hoursBeginMask="true,true,true" + hoursBeginVisible="true" + + hoursEnd="23:59:00" + hoursEndMask="true,true,true" + hoursEndVisible="false" + + delay="00:01:00" + delayMask="true,true,true" + delayVisible="false" + /> + <task + name="Start once delayed" + description="Start once time with delay (Timeout)" + command="run" + type="once delayed" + activated="false" + + weekMask="true,true,true,true,true,true,true" + weekMaskType="flat" + weekMaskVisible="false" + + date="0000/00/00" + dateVisible="false" + + hoursBegin="00:00:00" + hoursBeginMask="true,true,true" + hoursBeginVisible="false" + + hoursEnd="23:59:00" + hoursEndMask="true,true,true" + hoursEndVisible="false" + + delay="00:01:00" + delayMask="true,true,true" + delayVisible="true" + /> + </tasks> +</plugin> Property changes on: software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.xml ___________________________________________________________________ Name: svn:keywords + Id Added: software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java =================================================================== --- software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java (rev 0) +++ software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-06-03 12:50:57 UTC (rev 4738) @@ -0,0 +1,76 @@ +/* This file is part of "TuxDroid Plugin Clock". + * Copyright 2008, kysoh + * Author : Yoran Brault + * eMail : software@_bad_karma-lab.net (remove _bad_ before sending an email) + * Site : http://www.kysoh.com/ + * + * "TuxDroid Plugin Clock" 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.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid Plugin Clock" 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 "TuxDroid Plugin Clock"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package net.karmaLab.tuxDroid.plugins; + +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; + +import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin; +import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration; + +public class ClockPlugin extends SimplePlugin<SimplePluginConfiguration> { + + /** + * Main gadget access point. + * + * @param args + * commands + * @throws Exception + * errors + */ + public static void main(String[] args) throws Exception { + new ClockPlugin().boot(args, new SimplePluginConfiguration()); + } + + private final Calendar calendar = new GregorianCalendar(); + + @Override + public void start() { + if (getCommand().equals("run")) { + run(); + } + else { + run(); + } + } + + private void run() { + calendar.setTime(new Date()); + int h = calendar.get(Calendar.HOUR_OF_DAY); + int m = calendar.get(Calendar.MINUTE); + if (m != 0) { + throwMessage("Current time is {0} hours and {1} minutes.", h, m); + } else { + throwMessage("Current time is {0} hours.", h); + } + } + + @Override + public void onPluginStop() { + } + + @Override + public void onPluginEvent(String eventName, String[] eventValues) { + } +} Property changes on: software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java ___________________________________________________________________ Name: svn:keywords + Id |
|
From: remi <c2m...@c2...> - 2009-06-03 11:38:10
|
Author: remi
Date: 2009-06-03 13:38:01 +0200 (Wed, 03 Jun 2009)
New Revision: 4737
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
Log:
* configure "startedBy" parameter with "scheduler" when a gadget is started by the scheduler (alert)
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-06-03 11:03:57 UTC (rev 4736)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py 2009-06-03 11:38:01 UTC (rev 4737)
@@ -269,12 +269,16 @@
arguments = (
ugc.getDescription().getUuid(),
parentTask.getCommand(),
- {})
+ {
+ 'startedBy' : 'scheduler',
+ })
data = {
'commandType' : 'ugc_start',
'uuid' : ugc.getDescription().getUuid(),
'command' : parentTask.getCommand(),
- 'parameters' : {},
+ 'parameters' : {
+ 'startedBy' : 'scheduler',
+ },
}
date = ugcTask.getDateDict()
hoursBegin = ugcTask.getTimeDict(ugcTask.getHoursBegin())
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py 2009-06-03 11:03:57 UTC (rev 4736)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/Gadget.py 2009-06-03 11:38:01 UTC (rev 4737)
@@ -494,6 +494,9 @@
myParameters[parameter.getName()] = parameter.getDefaultValue()
if not parameters.has_key('uuid'):
myParameters['uuid'] = self.getDescription().getUuid()
+ for key in parameters.keys():
+ if not myParameters.has_key(key):
+ myParameters[key] = parameters[key]
return self.__parentPlugin.start(command, myParameters)
# --------------------------------------------------------------------------
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py 2009-06-03 11:03:57 UTC (rev 4736)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/ugc/Ugc.py 2009-06-03 11:38:01 UTC (rev 4737)
@@ -388,6 +388,9 @@
else:
myParameters[parameter.getName()] = parameter.getValue()
myParameters['uuid'] = self.getDescription().getUuid()
+ for key in parameters.keys():
+ if not myParameters.has_key(key):
+ myParameters[key] = parameters[key]
return self.__parentGadget.start(command, myParameters)
# --------------------------------------------------------------------------
|
|
From: remi <c2m...@c2...> - 2009-06-03 11:04:12
|
Author: remi
Date: 2009-06-03 13:03:57 +0200 (Wed, 03 Jun 2009)
New Revision: 4736
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
Log:
* added a parameter to know who has started the plugin/gadget/ugc "user" or "scheduler"
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-06-03 10:57:38 UTC (rev 4735)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-06-03 11:03:57 UTC (rev 4736)
@@ -122,11 +122,20 @@
'name' : 'uuid',
'type' : 'string',
'defaultValue' : self.getDescription().getUuid(),
- 'description' : 'Pitch',
+ 'description' : 'Uuid',
'category' : 'internals',
'visible' : 'false',
})
self.__parameters.append(pluginParameter)
+ pluginParameter = PluginParameter(self, {
+ 'name' : 'startedBy',
+ 'type' : 'string',
+ 'defaultValue' : 'user',
+ 'description' : 'Started by',
+ 'category' : 'internals',
+ 'visible' : 'false',
+ })
+ self.__parameters.append(pluginParameter)
# Create commands
self.__commands = []
for key in dictionary['commands'].keys():
|
|
From: remi <c2m...@c2...> - 2009-06-03 10:57:44
|
Author: remi
Date: 2009-06-03 12:57:38 +0200 (Wed, 03 Jun 2009)
New Revision: 4735
Modified:
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/pom.xml
Log:
* fixed plugin name
Modified: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/pom.xml
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/pom.xml 2009-06-03 10:22:15 UTC (rev 4734)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/pom.xml 2009-06-03 10:57:38 UTC (rev 4735)
@@ -2,7 +2,7 @@
<!--General project informations-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.kysoh</groupId>
- <artifactId>tuxdroid-plugin-javaSkeleton</artifactId>
+ <artifactId>plugin-javaSkeleton</artifactId>
<packaging>jar</packaging>
<version>0.0.1</version>
<name>This is a skeleton to build a java plugin.</name>
|
|
From: remi <c2m...@c2...> - 2009-06-03 10:22:22
|
Author: remi Date: 2009-06-03 12:22:15 +0200 (Wed, 03 Jun 2009) New Revision: 4734 Added: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/javacommonjar/tuxdroid-plugin-java-kit-0.0.3.jar Removed: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/javacommonjar/tuxdroid-gadget-java-kit-0.0.2.jar Log: * replaced the "java gadget tool kit" by the "java plugin tool kit" Deleted: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/javacommonjar/tuxdroid-gadget-java-kit-0.0.2.jar =================================================================== (Binary files differ) Added: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/javacommonjar/tuxdroid-plugin-java-kit-0.0.3.jar =================================================================== (Binary files differ) Property changes on: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/javacommonjar/tuxdroid-plugin-java-kit-0.0.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:keywords + Id |
|
From: remi <c2m...@c2...> - 2009-06-03 10:21:21
|
Author: remi
Date: 2009-06-03 12:21:07 +0200 (Wed, 03 Jun 2009)
New Revision: 4733
Added:
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/help.wiki
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/icon.png
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.pot
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.xml
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/sources/SkeletonPlugin.java
Removed:
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.png
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.pot
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.xml
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/help.html
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/sources/SkeletonGadget.java
Modified:
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/pom.xml
Log:
* refactored java plugin skeleton like the python one
Modified: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/pom.xml
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/pom.xml 2009-06-03 09:55:01 UTC (rev 4732)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/pom.xml 2009-06-03 10:21:07 UTC (rev 4733)
@@ -2,18 +2,18 @@
<!--General project informations-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.kysoh</groupId>
- <artifactId>tuxdroid-gadget-javaSkeleton</artifactId>
+ <artifactId>tuxdroid-plugin-javaSkeleton</artifactId>
<packaging>jar</packaging>
<version>0.0.1</version>
- <name>This is a skeleton to build a java gadget.</name>
+ <name>This is a skeleton to build a java plugin.</name>
<url>http://www.tuxisalive.com</url>
<!--Dependency list-->
<dependencies>
<dependency>
<groupId>com.kysoh</groupId>
- <artifactId>tuxdroid-gadget-java-kit</artifactId>
- <version>0.0.2</version>
+ <artifactId>tuxdroid-plugin-java-kit</artifactId>
+ <version>0.0.3</version>
</dependency>
</dependencies>
@@ -69,10 +69,10 @@
<mkdir dir="./libraries"/>
<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
todir="./libraries" />
- <zip destfile="./${project.artifactId}.tgf">
+ <zip destfile="./${project.artifactId}.scp">
<zipfileset dir="." includes="resources/*" />
<zipfileset dir="." includes="libraries/*" >
- <exclude name="libraries/tuxdroid-gadget-java-kit*" />
+ <exclude name="libraries/tuxdroid-plugin-java-kit*" />
<exclude name="libraries/karmalab-commons*" />
<exclude name="libraries/tuxdroid-java-api*" />
</zipfileset>
@@ -85,13 +85,13 @@
</goals>
</execution>
- <!--This section clean the ./libraries and the TGF file during the 'clean' lifecycle-->
+ <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
<execution>
<phase>clean</phase>
<configuration>
<tasks>
<delete dir="./libraries"/>
- <delete file="./${project.artifactId}.tgf"/>
+ <delete file="./${project.artifactId}.scp"/>
</tasks>
</configuration>
<goals>
Deleted: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.png
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.pot
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.pot 2009-06-03 09:55:01 UTC (rev 4732)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.pot 2009-06-03 10:21:07 UTC (rev 4733)
@@ -1,41 +0,0 @@
-msgid "Java gadget skeleton"
-msgstr ""
-
-msgid "Java skeleton."
-msgstr ""
-
-msgid "This is a skeleton to build a java gadget."
-msgstr ""
-
-msgid "Simple string parameter"
-msgstr ""
-
-msgid "Simple integer parameter"
-msgstr ""
-
-msgid "Simple boolean parameter"
-msgstr ""
-
-msgid "Simple enumerated parameter"
-msgstr ""
-
-msgid "Linux only parameter"
-msgstr ""
-
-msgid "Only for Linux"
-msgstr ""
-
-msgid "Windows only parameter"
-msgstr ""
-
-msgid "Only for Windows"
-msgstr ""
-
-msgid "Simple run command"
-msgstr ""
-
-msgid "Daemon run command"
-msgstr ""
-
-msgid "Simple check command"
-msgstr ""
Deleted: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.xml
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.xml 2009-06-03 09:55:01 UTC (rev 4732)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/gadget.xml 2009-06-03 10:21:07 UTC (rev 4733)
@@ -1,68 +0,0 @@
-<gadget>
- <interpreter
- kind="java">
- <executable>SkeletonGadget</executable>
- </interpreter>
- <description>
- <name>Java gadget skeleton</name>
- <ttsName>Java skeleton.</ttsName>
- <description>This is a skeleton to build a java gadget.</description>
- <author>Kysoh</author>
- <version>0.0.1</version>
- <iconFile>resources/gadget.png</iconFile>
- <uuid>23ab109b-9bad-41cb-bca6-ab6d4bbe632f</uuid>
- <platform>all</platform>
- </description>
- <parameters>
- <parameter
- name="stringParam"
- description="Simple string parameter"
- type="string"
- defaultValue="My string"
- platform="all"/>
- <parameter
- name="integerParam"
- description="Simple integer parameter"
- type="integer"
- defaultValue="0"
- platform="all"/>
- <parameter
- name="booleanParam"
- description="Simple boolean parameter"
- type="boolean"
- defaultValue="false"
- platform="all"/>
- <parameter
- name="enumeratedParam"
- description="Simple enumerated parameter"
- type="enum(value1,value2,value3,value4,valueN)"
- defaultValue="value1"
- platform="all"/>
- <parameter
- name="linuxParam"
- description="Linux only parameter"
- type="string"
- defaultValue="Only for Linux"
- platform="linux"/>
- <parameter
- name="windowsParam"
- description="Windows only parameter"
- type="string"
- defaultValue="Only for Windows"
- platform="windows"/>
- </parameters>
- <commands>
- <command
- name="run"
- description="Simple run command"
- daemon="false" />
- <command
- name="run_daemon"
- description="Daemon run command"
- daemon="true" />
- <command
- name="check"
- description="Simple check command"
- daemon="false" />
- </commands>
-</gadget>
Deleted: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/help.html
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/help.html 2009-06-03 09:55:01 UTC (rev 4732)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/help.html 2009-06-03 10:21:07 UTC (rev 4733)
@@ -1,6 +0,0 @@
-<html>
-<body>
-<font size="2" face="Verdana, Arial, Helvetica, sans-serif">This is a skeleton to build a java gadget.<br>
-</font>
-</body>
-</html>
Added: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/help.wiki
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/help.wiki (rev 0)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/help.wiki 2009-06-03 10:21:07 UTC (rev 4733)
@@ -0,0 +1,25 @@
+= Synopsis =
+This is a skeleton to help developpers to build they first plugin.
+
+== Some markup tests ==
+Some markup tests.
+* a mixed
+* multilevel
+*1. list
+*1I. with
+*1I. roman
+*1Ig. and
+*1Ig. greek
+*1. letters
+
+A plugin from the [http://www.kysoh.com, Kysoh] compagny.
+
+; '''Plugin definition''': ''A plugin is a set of functions stored in a scp file.''
+
+== An example of table ==
+
+[{>,w:80\%,b}| '''Plugin name''' | '''On demand''' | '''Have alerts''' |
+| Battery monitor | ''No'' | ''Yes'' |
+| Feed RSS | ''Yes'' | ''Yes'' |
+| Webradio | ''Yes'' | ''Yes'' |
+| Clipboard | ''Yes'' | ''No'' |]
\ No newline at end of file
Property changes on: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/help.wiki
___________________________________________________________________
Name: svn:keywords
+ Id
Added: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/icon.png
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:keywords
+ Id
Added: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.pot
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.pot (rev 0)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.pot 2009-06-03 10:21:07 UTC (rev 4733)
@@ -0,0 +1,41 @@
+msgid "Java plugin skeleton"
+msgstr ""
+
+msgid "Java skeleton."
+msgstr ""
+
+msgid "This is a skeleton to build a java plugin."
+msgstr ""
+
+msgid "Simple string parameter"
+msgstr ""
+
+msgid "Simple integer parameter"
+msgstr ""
+
+msgid "Simple boolean parameter"
+msgstr ""
+
+msgid "Simple enumerated parameter"
+msgstr ""
+
+msgid "Linux only parameter"
+msgstr ""
+
+msgid "Only for Linux"
+msgstr ""
+
+msgid "Windows only parameter"
+msgstr ""
+
+msgid "Only for Windows"
+msgstr ""
+
+msgid "Simple run command"
+msgstr ""
+
+msgid "Daemon run command"
+msgstr ""
+
+msgid "Simple check command"
+msgstr ""
Property changes on: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.pot
___________________________________________________________________
Name: svn:keywords
+ Id
Added: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.xml (rev 0)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.xml 2009-06-03 10:21:07 UTC (rev 4733)
@@ -0,0 +1,174 @@
+<plugin>
+ <interpreter
+ kind="java">
+ <executable>SkeletonPlugin</executable>
+ </interpreter>
+ <description>
+ <name>Java plugin skeleton</name>
+ <ttsName>Java plugin.</ttsName>
+ <description>This is a skeleton to build a java plugin.</description>
+ <author>Kysoh</author>
+ <version>0.0.1</version>
+ <iconFile>resources/icon.png</iconFile>
+ <uuid>23ab109b-9bad-41cb-bca6-ab6d4bbe632f</uuid>
+ <platform>all</platform>
+ </description>
+ <parameters>
+ <parameter
+ name="stringParam"
+ description="Simple string parameter"
+ type="string"
+ defaultValue="My string"
+ platform="all"/>
+ <parameter
+ name="integerParam"
+ description="Simple integer parameter"
+ type="integer"
+ defaultValue="0"
+ platform="all"/>
+ <parameter
+ name="booleanParam"
+ description="Simple boolean parameter"
+ type="boolean"
+ defaultValue="false"
+ platform="all"/>
+ <parameter
+ name="enumeratedParam"
+ description="Simple enumerated parameter"
+ type="enum(value1,value2,value3,value4,valueN)"
+ defaultValue="value1"
+ platform="all"/>
+ <parameter
+ name="linuxParam"
+ description="Linux only parameter"
+ type="string"
+ defaultValue="Only for Linux"
+ platform="linux"/>
+ <parameter
+ name="windowsParam"
+ description="Windows only parameter"
+ type="string"
+ defaultValue="Only for Windows"
+ platform="windows"/>
+ </parameters>
+ <commands>
+ <command
+ name="run"
+ description="Simple run command"
+ daemon="false" />
+ <command
+ name="run_daemon"
+ description="Daemon run command"
+ daemon="true" />
+ <command
+ name="check"
+ description="Simple check command"
+ daemon="false" />
+ </commands>
+ <tasks>
+ <task
+ name="My checker"
+ description="Check a condition every x minutes"
+ command="check"
+ type="every x"
+ activated="false"
+
+ weekMask="true,false,false,false,false,false,false"
+ weekMaskType="exclusive"
+ weekMaskVisible="true"
+
+ date="0000/00/00"
+ dateVisible="false"
+
+ hoursBegin="00:00:00"
+ hoursBeginMask="true,true,false"
+ hoursBeginVisible="true"
+
+ hoursEnd="23:59:00"
+ hoursEndMask="true,true,false"
+ hoursEndVisible="true"
+
+ delay="00:01:00"
+ delayMask="false,true,false"
+ delayVisible="true"
+ />
+ <task
+ name="My daemon"
+ description="Manages my daemon"
+ command="run_daemon"
+ type="daily at"
+ activated="false"
+
+ weekMask="true,true,true,true,true,true,true"
+ weekMaskType="weekpart"
+ weekMaskVisible="true"
+
+ date="2009/10/10"
+ dateVisible="false"
+
+ hoursBegin="07:00:00"
+ hoursBeginMask="true,true,false"
+ hoursBeginVisible="true"
+
+ hoursEnd="10:00:00"
+ hoursEndMask="true,true,false"
+ hoursEndVisible="true"
+
+ delay="00:01:00"
+ delayMask="false,true,false"
+ delayVisible="false"
+ />
+ <task
+ name="Anniversary"
+ description="Don't forget my anniversary !"
+ command="run"
+ type="once at"
+ activated="false"
+
+ weekMask="true,true,true,true,true,true,true"
+ weekMaskType="flat"
+ weekMaskVisible="false"
+
+ date="2009/10/10"
+ dateVisible="true"
+
+ hoursBegin="10:00:00"
+ hoursBeginMask="true,true,false"
+ hoursBeginVisible="true"
+
+ hoursEnd="23:59:00"
+ hoursEndMask="true,true,false"
+ hoursEndVisible="false"
+
+ delay="00:01:00"
+ delayMask="false,true,false"
+ delayVisible="false"
+ />
+ <task
+ name="A complete alert configuration"
+ description="This show a complet alert configuration"
+ command="run"
+ type="daily at"
+ activated="false"
+
+ weekMask="true,true,true,true,true,true,true"
+ weekMaskType="flat"
+ weekMaskVisible="true"
+
+ date="2009/12/31"
+ dateVisible="true"
+
+ hoursBegin="10:00:00"
+ hoursBeginMask="true,true,true"
+ hoursBeginVisible="true"
+
+ hoursEnd="11:59:00"
+ hoursEndMask="true,true,true"
+ hoursEndVisible="true"
+
+ delay="00:01:00"
+ delayMask="true,true,true"
+ delayVisible="true"
+ />
+ </tasks>
+</plugin>
Property changes on: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/resources/plugin.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/sources/SkeletonGadget.java
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/sources/SkeletonGadget.java 2009-06-03 09:55:01 UTC (rev 4732)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/sources/SkeletonGadget.java 2009-06-03 10:21:07 UTC (rev 4733)
@@ -1,205 +0,0 @@
-/* This file is part of "Skeleton java gadget".
- * Copyright 2009, kysoh
- * Author : Remi Jocaille
- * eMail : rem...@c2...
- * Site : http://www.kysoh.com/
- *
- * "Skeleton java gadget" 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.1 of
- * the License, or (at your option) any later version.
- *
- * "Skeleton java gadget" 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 "Skeleton java gadget"; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
-import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadgetConfiguration;
-import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadgetException;
-
-/**
- * This class override the SimpleGadget class to make easy
- * the gadget coding.
- */
-public class SkeletonGadget extends SimpleGadget<SkeletonGadget.Configuration>
-{
- /**
- * Enumerator of the parameter "enumeratedParam"
- */
- public static enum EnumParameter
- {
- value1, value2, value3, value4, valueN;
- }
-
- /**
- * This class make an access to the gadget parameters.
- * Parameters are automatically filled by the SimpleGadget class at gadget
- * starting.
- */
- public static class Configuration extends SimpleGadgetConfiguration
- {
- private String stringParam = "";
- private int integerParam = 0;
- private boolean booleanParam = false;
- private EnumParameter enumeratedParam = EnumParameter.value1;
- private String linuxParam = "";
- private String windowsParam = "";
-
- public String getStringParam()
- {
- return stringParam;
- }
-
- public void setStringParam(String stringParam)
- {
- this.stringParam = stringParam;
- }
-
- public int getIntegerParam()
- {
- return integerParam;
- }
-
- public void setIntegerParam(int integerParam)
- {
- this.integerParam = integerParam;
- }
-
- public boolean getBooleanParam()
- {
- return booleanParam;
- }
-
- public void setBooleanParam(boolean booleanParam)
- {
- this.booleanParam = booleanParam;
- }
-
- public EnumParameter getEnumeratedParam()
- {
- return enumeratedParam;
- }
-
- public void setEnumeratedParam(EnumParameter enumeratedParam)
- {
- this.enumeratedParam = enumeratedParam;
- }
-
- public String getLinuxParam()
- {
- return linuxParam;
- }
-
- public void setLinuxParam(String linuxParam)
- {
- this.linuxParam = linuxParam;
- }
-
- public String getWindowsParam()
- {
- return windowsParam;
- }
-
- public void setWindowsParam(String windowsParam)
- {
- this.windowsParam = windowsParam;
- }
- }
-
- private boolean daemonRun = false;
-
- /**
- * Program entry point.
- */
- public static void main(String[] args) throws Exception {
- new SkeletonGadget().boot(args, new Configuration());
- }
-
- /**
- * Gadget entry point.
- * This method should be used to dispatch commands.
- */
- public void start() throws SimpleGadgetException
- {
- if (this.getCommand().equals("run"))
- {
- this.run();
- }
- else if (this.getCommand().equals("run_daemon"))
- {
- this.runDaemon();
- }
- else if (this.getCommand().equals("check"))
- {
- this.check();
- }
- else
- {
- this.run();
- }
- }
-
- /**
- * Gadget entry point for the "run" command.
- */
- private void run()
- {
- if (this.isWindows())
- {
- this.throwMessage(this.configuration().getWindowsParam());
- }
- else
- {
- this.throwMessage(this.configuration().getLinuxParam());
- }
- this.throwMessage("I finished my work ...");
- }
-
- /**
- * Gadget entry point for the "run_daemon" command.
- */
- private void runDaemon()
- {
- /* Start a fake daemon loop ...
- * Warning the daemonRun flag is not safe-thread (in order to have a
- * clean code in this gadget example) */
- this.daemonRun = true;
- while (this.daemonRun)
- {
- try
- {
- Thread.sleep(500);
- }
- catch (InterruptedException e) {}
- }
- }
-
- /**
- * Gadget entry point for the "check" command.
- */
- private void check()
- {
- /* Check a condition ...
- * For example get the value of the parameter "booleanParam" */
- boolean checkResult = this.configuration().getBooleanParam();
- /* Return the check result */
- this.throwResult(checkResult);
- this.throwMessage("I throwed my result, so I can die. RIP ...");
- }
-
- /**
- * Callback on gadget stop.
- */
- public void onGadgetStop()
- {
- /* Stop the fake daemon loop */
- this.daemonRun = false;
- }
-}
Copied: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/sources/SkeletonPlugin.java (from rev 4620, software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/sources/SkeletonGadget.java)
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/sources/SkeletonPlugin.java (rev 0)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/skeleton/trunk/sources/SkeletonPlugin.java 2009-06-03 10:21:07 UTC (rev 4733)
@@ -0,0 +1,220 @@
+/* This file is part of "Skeleton java plugin".
+ * Copyright 2009, kysoh
+ * Author : Remi Jocaille
+ * eMail : rem...@c2...
+ * Site : http://www.kysoh.com/
+ *
+ * "Skeleton java plugin" 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.1 of
+ * the License, or (at your option) any later version.
+ *
+ * "Skeleton java plugin" 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 "Skeleton java plugin"; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
+import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration;
+import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginException;
+
+/**
+ * This class override the SimpleGadget class to make easy
+ * the gadget coding.
+ */
+public class SkeletonPlugin extends SimplePlugin<SkeletonPlugin.Configuration>
+{
+ /**
+ * Enumerator of the parameter "enumeratedParam"
+ */
+ public static enum EnumParameter
+ {
+ value1, value2, value3, value4, valueN;
+ }
+
+ /**
+ * This class make an access to the gadget parameters.
+ * Parameters are automatically filled by the SimpleGadget class at gadget
+ * starting.
+ */
+ public static class Configuration extends SimplePluginConfiguration
+ {
+ private String stringParam = "";
+ private int integerParam = 0;
+ private boolean booleanParam = false;
+ private EnumParameter enumeratedParam = EnumParameter.value1;
+ private String linuxParam = "";
+ private String windowsParam = "";
+
+ public String getStringParam()
+ {
+ return stringParam;
+ }
+
+ public void setStringParam(String stringParam)
+ {
+ this.stringParam = stringParam;
+ }
+
+ public int getIntegerParam()
+ {
+ return integerParam;
+ }
+
+ public void setIntegerParam(int integerParam)
+ {
+ this.integerParam = integerParam;
+ }
+
+ public boolean getBooleanParam()
+ {
+ return booleanParam;
+ }
+
+ public void setBooleanParam(boolean booleanParam)
+ {
+ this.booleanParam = booleanParam;
+ }
+
+ public EnumParameter getEnumeratedParam()
+ {
+ return enumeratedParam;
+ }
+
+ public void setEnumeratedParam(EnumParameter enumeratedParam)
+ {
+ this.enumeratedParam = enumeratedParam;
+ }
+
+ public String getLinuxParam()
+ {
+ return linuxParam;
+ }
+
+ public void setLinuxParam(String linuxParam)
+ {
+ this.linuxParam = linuxParam;
+ }
+
+ public String getWindowsParam()
+ {
+ return windowsParam;
+ }
+
+ public void setWindowsParam(String windowsParam)
+ {
+ this.windowsParam = windowsParam;
+ }
+ }
+
+ private boolean daemonRun = false;
+
+ /**
+ * Program entry point.
+ */
+ public static void main(String[] args) throws Exception {
+ new SkeletonPlugin().boot(args, new Configuration());
+ }
+
+ /**
+ * Plugin entry point.
+ * This method should be used to dispatch commands.
+ */
+ public void start() throws SimplePluginException
+ {
+ if (this.getCommand().equals("run"))
+ {
+ this.run();
+ }
+ else if (this.getCommand().equals("run_daemon"))
+ {
+ this.runDaemon();
+ }
+ else if (this.getCommand().equals("check"))
+ {
+ this.check();
+ }
+ else
+ {
+ this.run();
+ }
+ }
+
+ /**
+ * Plugin entry point for the "run" command.
+ */
+ private void run()
+ {
+ if (this.isWindows())
+ {
+ this.throwMessage(this.configuration().getWindowsParam());
+ }
+ else
+ {
+ this.throwMessage(this.configuration().getLinuxParam());
+ }
+ this.throwActuation("mouthOn", 2, "NDEF");
+ this.throwMessage("I finished my work ...");
+ }
+
+ /**
+ * Plugin entry point for the "run_daemon" command.
+ */
+ private void runDaemon()
+ {
+ /* Start a fake daemon loop ...
+ * Warning the daemonRun flag is not safe-thread (in order to have a
+ * clean code in this plugin example) */
+ this.daemonRun = true;
+ while (this.daemonRun)
+ {
+ try
+ {
+ Thread.sleep(500);
+ }
+ catch (InterruptedException e) {}
+ }
+ }
+
+ /**
+ * Plugin entry point for the "check" command.
+ */
+ private void check()
+ {
+ /* Check a condition ...
+ * For example get the value of the parameter "booleanParam" */
+ boolean checkResult = this.configuration().getBooleanParam();
+ /* Return the check result */
+ this.throwResult(checkResult);
+ this.throwMessage("I throwed my result, so I can die. RIP ...");
+ }
+
+ /**
+ * Callback on plugin stop.
+ */
+ public void onPluginStop()
+ {
+ /* Stop the fake daemon loop */
+ this.daemonRun = false;
+ }
+
+ /**
+ * Callback on plugin event.
+ */
+ public void onPluginEvent(String eventName, String[] eventValues)
+ {
+ this.throwMessage("I received event");
+ this.throwTrace(eventName);
+ this.throwTrace(Integer.toString(eventValues.length));
+ for (int i = 0; i < eventValues.length; i++)
+ {
+ this.throwTrace(eventValues[i]);
+ }
+ }
+}
|
|
From: remi <c2m...@c2...> - 2009-06-03 09:55:13
|
Author: remi
Date: 2009-06-03 11:55:01 +0200 (Wed, 03 Jun 2009)
New Revision: 4732
Modified:
software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/simpleplugin-java-kit/trunk/pom.xml
Log:
* added path to locally deploy the library in maven system (mvn deploy)
Modified: software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/simpleplugin-java-kit/trunk/pom.xml
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/simpleplugin-java-kit/trunk/pom.xml 2009-06-03 09:41:30 UTC (rev 4731)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/java/simpleplugin-java-kit/trunk/pom.xml 2009-06-03 09:55:01 UTC (rev 4732)
@@ -32,8 +32,9 @@
<distributionManagement>
<repository>
<id>kysoh</id>
- <name>Kysohl Repository</name>
- <url>file:///tmp/maven2</url>
+ <name>Kysoh internal Repository</name>
+ <!-- Replace the url with your local configuration -->
+ <url>file:///C:\Documents and Settings\User\.m2</url>
</repository>
</distributionManagement>
|
|
From: remi <c2m...@c2...> - 2009-06-03 09:41:37
|
Author: remi
Date: 2009-06-03 11:41:30 +0200 (Wed, 03 Jun 2009)
New Revision: 4731
Modified:
software_suite_v3/smart-core/smart-dev/plugin-toolkit/python/skeleton/trunk/executables/plugin-skeleton.py
Log:
* added a throwActuation "mouthOn(2, 'NDEF')" in the python plugin skeleton
* added the callback on server event.
Modified: software_suite_v3/smart-core/smart-dev/plugin-toolkit/python/skeleton/trunk/executables/plugin-skeleton.py
===================================================================
--- software_suite_v3/smart-core/smart-dev/plugin-toolkit/python/skeleton/trunk/executables/plugin-skeleton.py 2009-06-03 09:34:02 UTC (rev 4730)
+++ software_suite_v3/smart-core/smart-dev/plugin-toolkit/python/skeleton/trunk/executables/plugin-skeleton.py 2009-06-03 09:41:30 UTC (rev 4731)
@@ -113,6 +113,7 @@
self.throwMessage(self.configuration().getWindowsParam())
else:
self.throwMessage(self.configuration().getLinuxParam())
+ self.throwActuation("mouthOn", 2, 'NDEF')
self.throwMessage("I finished my work ...")
def runDaemon(self):
@@ -141,6 +142,17 @@
# Stop the fake daemon loop
self.__daemonRun = False
+ def onPluginEvent(self, eventName, eventValues):
+ """Callback on plugin event.
+ @param eventName: Event name.
+ @param eventValues: Event values.
+ """
+ self.throwMessage("I received event")
+ self.throwTrace(eventName)
+ self.throwTrace(len(eventValues))
+ for value in eventValues:
+ self.throwTrace(value)
+
if __name__ == "__main__":
plugin = SkeletonPlugin()
plugin.boot(sys.argv[1:], Configuration())
|
1 message has been excluded from this view by a project administrator.
