Author: jerome Date: 2008-08-27 11:20:38 +0200 (Wed, 27 Aug 2008) New Revision: 1606
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
Log:
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-08-27 09:12:24 UTC (rev 1605)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-08-27 09:20:38 UTC (rev 1606)
@@ -84,6 +84,7 @@
import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstance;
import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstanceParameters;
import com.kysoh.tuxdroid.gadget.framework.container.GadgetToken;
+import com.kysoh.tuxdroid.gadget.framework.container.I18N;
import com.kysoh.tuxdroid.gadget.framework.tester.GadgetPropertyEditor;
import com.tuxdroid.cc.Listener.HandCursorChanger;
import com.tuxdroid.cc.Listener.MenuListener;
@@ -286,8 +287,10 @@
tux.event.handler.register("all", tux, "onAllEvent");
tux.event.handler.register(TuxAPIConst.ST_NAME_RADIO_STATE,
this,
"onRadioConnected", "True", null);
+ tux.event.handler.register(TuxAPIConst.ST_NAME_DONGLE_PLUG,
this,
+ "onRadioDisconnected",
"False", null);
tux.event.handler.register(TuxAPIConst.ST_NAME_RADIO_STATE,
this,
- "onRadioDisconnected",
"False", null);
+ "onRadioDisconnected",
"False", null);
tux.server.registerEventOnConnected(this,
"onTuxServerConnected");
//Create remoteControl object.
this.remoteControl = new CCRemoteActions(this.tux, true, this);
@@ -313,7 +316,8 @@
private void initInterface(){
//Getting CcInterface.
getJFrame();
- jFrame.pack(); //Packing components.
+ jFrame.pack(); //Packing components.
+ I18N.cc_Locale = new Locale(settings.getLanguage());
}
@@ -402,12 +406,11 @@
/**
* Callback that gets the radio connaction event.
* @param objects
- */
- //FIXME
+ */
public void onRadioConnected(String value, Double delay){
setOnlineStatus(true);
tray.setIcon(this.tray_online);
- //this.interfaceMenusLang.setTux(tux);
+
this.popupFileMenu = null;
this.constructFileMenu();
jFrame.pack();
@@ -833,9 +836,9 @@
}
});
- if(tux.radio.getConnected())
+ if(tux.radio.getConnected()){
popupFileMenu.add(pitch);
-
+ }
popupFileMenu.addSeparator();
final String path = language.getMenuSubDirectory();
//Add exit menu item that allow to exit application.
@@ -859,7 +862,6 @@
});
fileMenu.addMouseMotionListener(new
HandCursorChanger(jContentPane));
}
- else System.out.println("menu is not null");
}
/**
@@ -2400,61 +2402,67 @@
.getResource("images/buttons/btn-test-down.png"));
boolean Flag = true;
- public void
mousePressed(java.awt.event.MouseEvent event){
+ public void
mouseReleased(java.awt.event.MouseEvent event){
+ test.setIcon(icon);
+ }
+
+ public void
mouseClicked(java.awt.event.MouseEvent event){
int type =
gadgetPanel.getType();
if(type != -1){
-
- switch(type){
-
- case 0 : //Attitune
alarm type.
- if(Flag &&
tux.radio.getConnected()){
- Flag =
!Flag;
-
test.setIcon(iconPressed);
-
file_browser.playAttituneFromPath(gadgetPanel.getAttitune());
-
test.setIcon(icon);
- }
- else if(!Flag){
- Flag =
!Flag;
-
file_browser.stopPlaying(TYPE_ATTITUNES, FileBrowser.REMOTELIST_TYPE);
-
test.setIcon(icon);
- }
- else{
- String
paneTitle = language.messages.getMessageBoxTitle();
- String
message = language.messages.getRadioErrorMessage();
-
JOptionPane.showMessageDialog(jContentPane, message,
-
paneTitle, JOptionPane.ERROR_MESSAGE);
- }
-
- break;
-
- case 1 : //tts alarm
type.
-
- Flag =
!Flag;
- String
tts = gadgetPanel.getTTSMessage();
-
tux.tts.speak(tts);
-
- break;
-
- case 2 : //run gadget
alarm type.
+ // TODO
+
switch(type){
+
+ case 0
: //Attitune alarm type.
+
if(Flag && tux.radio.getConnected()){
+
Flag = !Flag;
+
file_browser.playAttituneFromPath(gadgetPanel.getAttitune());
+
}
+
else if(!Flag){
+
Flag = !Flag;
+
file_browser.stopPlaying(TYPE_ATTITUNES, FileBrowser.REMOTELIST_TYPE);
+
}
+
else{
+
String paneTitle = language.messages.getMessageBoxTitle();
+
String message = language.messages.getRadioErrorMessage();
+
JOptionPane.showMessageDialog(jContentPane, message,
+
paneTitle, JOptionPane.ERROR_MESSAGE);
+
}
+
+
break;
+
+ case 1
: //tts alarm type.
+
+
Flag = !Flag;
+
String tts = gadgetPanel.getTTSMessage();
+
tux.tts.speak(tts);
- if(Flag){
- Flag =
!Flag;
-
if(gdg.haveCommands()){
-
instance.start(gdg.getFirstCommand(), parameters.getValues());
+
break;
+
+ case 2
: //run gadget alarm type.
+
+
if(Flag){
+
Flag = !Flag;
+
if(gdg.haveCommands()){
+
instance.start(gdg.getFirstCommand(), parameters.getValues());
+
}
+
else{
+
instance.start(null, parameters.getValues());
+
}
+
}
+
else{
+
Flag = !Flag;
+
tux.tts.stop();
+
}
+
break;
+
}
- else{
-
instance.start(null, parameters.getValues());
- }
}
- else{
- Flag =
!Flag;
-
tux.tts.stop();
- }
- break;
-
- }
- }
}
+
+ public void
mousePressed(java.awt.event.MouseEvent event){
+ test.setIcon(iconPressed);
+ jFrame.repaint();
+ }
});
this.jTabbedPane.addTab(language.getPanelAlarm(), cont);
@@ -2471,6 +2479,7 @@
else
if(arg0.getPropertyName().equalsIgnoreCase("scheduler-trigger-event")){
if(this.fromSheduler){
String uid = (String)arg0.getNewValue();
+ //TODO verify uid exists.
String path = this.settings.getPathByUUID(uid);
//Scheduled object is an attitune.
@@ -2670,8 +2679,9 @@
URL url = new URL(objf.toString());
//Getting information about host to advise
users if file isn't
//a tuxisalive file.
- String from = url.getHost();
- if(!from.equals("www.tuxisalive.com")){
+ String from = url.getHost();
+ System.out.println(from);
+ if(!from.equals("livewithapenguin.com")){
String msg =
language.messages.getHostWarningMessage();
JOptionPane.showMessageDialog(jContentPane, msg, title,
JOptionPane.ERROR_MESSAGE);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
