tux-droid-svn Mailing List for Tux Droid CE (Page 182)
Status: Beta
Brought to you by:
ks156
You can subscribe to this list here.
2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: jerome <c2m...@c2...> - 2008-08-14 11:10:01
|
Author: jerome Date: 2008-08-14 13:09:55 +0200 (Thu, 14 Aug 2008) New Revision: 1484 Added: software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/branches/ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/tags/ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/.classpath software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/.project software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/X10Gimli/ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/X10Gimli/X10Gimli.jar software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/X10GimliNative.dll software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/src/ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/src/com/ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/src/main/ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/src/main/WMPlayer.java software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/src/resources/ Log: * First media player gadget junk. Added: software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/.classpath =================================================================== --- software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/.classpath (rev 0) +++ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/.classpath 2008-08-14 11:09:55 UTC (rev 1484) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="dll"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="X10Gimli/X10Gimli.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/karmalab-commons"/> + <classpathentry combineaccessrules="false" kind="src" path="/tuxdroid-gadget-framework"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/.project =================================================================== --- software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/.project (rev 0) +++ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/.project 2008-08-14 11:09:55 UTC (rev 1484) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>wmpplayer</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/X10Gimli/X10Gimli.jar =================================================================== (Binary files differ) Property changes on: software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/X10Gimli/X10Gimli.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/X10GimliNative.dll =================================================================== (Binary files differ) Property changes on: software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/X10GimliNative.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/src/main/WMPlayer.java =================================================================== --- software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/src/main/WMPlayer.java (rev 0) +++ software_suite_v2/software/gadgets/tuxdroid-gadget-WMP/trunk/tuxdroid-gadget-WMP/src/main/WMPlayer.java 2008-08-14 11:09:55 UTC (rev 1484) @@ -0,0 +1,707 @@ +package main; + + +import java.awt.AWTException; +import java.awt.Robot; +import java.awt.Toolkit; +import java.awt.event.KeyEvent; +import java.io.*; +/* +import java.io.File; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; + */ +import javax.swing.JOptionPane; + +import main.noDongleException; +import main.noRadioException; +import main.noConnectionException; + +import X10Gimli.Native.WindowsAPI; + +import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget; +import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadgetConfiguration; +import com.tuxisalive.api.TuxAPI; +import com.tuxisalive.api.TuxAPIConst; +import com.tuxisalive.api.TuxAPIMisc; + +import net.karmaLab.po.*; + + +/** +* @author Francois Finfe +* @version 0.1 +*/ + + + +public class WMPlayer extends SimpleGadget<WMPlayer.Configuration>{ + I18n i18n; + WindowsAPI WinAPI; + Robot robot; + TuxAPI tux; + static WMPlayer WMPlayerobject; + int handle; + + //public class that manage a simple configuration. + public static class Configuration extends SimpleGadgetConfiguration{ + + // Absolute Path/ link to the program to launch + private String mediaPath = "C:\\WINDOWS\\Media\\Windows XP Drrage.wav"; + //private String path = ""; + + + + /** + * + * This method set the local variable mediaPath. + * The function is called by the control center to set the local variable. + * It's the only way to write this variable. + * + * @param mediaPath The path to the media to launch + */ + + + public void setMediaPath(String mediaPath){ + this.mediaPath = mediaPath; + } + + + public String getMediaPath(){ + return this.mediaPath; + } + + + + + + } + + + + //Configuration object. + + @Override + public void start() throws Exception { + + robot = new Robot(); // robot is used for simulate key pressed + WinAPI = new WindowsAPI(); // windows api is used for sending messaging to WMP + // note: X10GimliNative.dll has to be placed in system32 folder for the jar + + // this method launch wmp and play the media (getmediaPath) if boolean true + launchWMP(true); + + // This section connect the TuxAPI to the server + + + try{ + connectToServer("localhost", 270, "test", "myPasswd", 3.0); + } + catch(noConnectionException e) + { + throwMessageNotification(i18n.tr("Error")+" "+e.getMessage()); + tux.destroy(); + System.exit(0); + } + catch(noDongleException e){ + throwMessageNotification(i18n.tr("Warning")+": "+e.getMessage()); + + } + catch(noRadioException e){ + throwMessageNotification(i18n.tr("Warning")+": "+e.getMessage()); + + } + + // We register an event handler on keypressed or released from tux + + tux.button.remote.registerEventOnPressed(this, "remote_button",null); + + // Set the focus on WMP and restore it + + handle = setFocusOnWMP(); + + i18n = new I18n(); + i18n.setPoFolder(new File("./resources")); + + + System.out.println (i18n.tr("This is a message with one parameter : %d", 1)); + + //tux.destroy(); + //System.exit(0); + } + + + + + public static void main(String[] args) throws InterruptedException, IOException { + //Stand alone behavior. + new WMPlayer().boot(new Configuration()); + } + + + + /** + * This function try to find a WMP windows. If not found, launch WMP. + * + * Than restore the windows if minimized and set the focus on it + * + * If after 20 attempt to launch and find WMP, the function exit and generate a messagenotification + * + * @return handle number + * + */ + + + public int setFocusOnWMP() + { + int handle = 0; + int count = 0; + while ((handle == 0) && (count <= 20)) + { + + + try + { + handle=WinAPI.findWindow("WMPlayerApp",null); + if (handle == 0) + { + //throwMessageNotification("Error: can't find Windows Media Player Windows"); + launchWMP(false); + Thread.sleep(100); + count++; + } + } + catch (Exception e) + { + throwMessageNotification(i18n.tr("Error")+": ("+e.getMessage()+")"); + return handle; + } + } + + // if a problem occur, don't loop for infinite + if (count > 20) + { + throwMessageNotification(i18n.tr("Error can't find Windows Media Player")); + return 0; + } + + WinAPI.setFocus(handle); + int Height=400; + int Width=400; + int lParam = (Height * 2 ^ 16) + Width; + + WinAPI.postMessage(handle, 0x0005, 0, lParam); + + + + + return handle; + + } + + + /** + * This function send the command to increase volume to WMP with a step of about 20 %. + * + * @param the handle number of WMP + * + */ + + + public void WMPIncreaseVolume(int handle) + { + /* + int Height=400; + int Width=400; + int lParam = (Height * 2 ^ 16) + Width; + + WinAPI.postMessage(handle, 0x0005, 0, lParam); + robot.keyPress(KeyEvent.VK_CONTROL); + robot.keyPress(KeyEvent.VK_F10); + robot.keyRelease(KeyEvent.VK_F10); + robot.keyRelease(KeyEvent.VK_CONTROL); + */ + + System.out.println("Up"); + WinAPI.postMessage(handle, 0x000111, 0x497F, 0); + + } + + + /** + * This function send the command to decrease volume to WMP with a step of about 20 %. + * + * @param the handle number of WMP + * + */ + + public void WMPDecreaseVolume(int handle) + { + WinAPI.postMessage(handle, 0x000111, 0x4980, 0); + } + + /** + * This function send the command to mute volume to WMP. + * + * @param the handle number of WMP + * + */ + + + public void WMPMute(int handle) + { + + WinAPI.postMessage(handle, 0x000111, 0x4981, 0); + } + + + /** + * This function send the command "next" to WMP. + * + * @param the handle number of WMP + * + */ + + + public void WMPNext(int handle) + { + WinAPI.postMessage(handle, 0x000111, 0x497B, 0); + + } + + + + /** + * This function send the command "previous" to WMP. + * + * @param the handle number of WMP + * + */ + + + public void WMPPrevious(int handle) + { + WinAPI.postMessage(handle, 0x000111, 0x497A, 0); + + } + + + + /** + * This function send the command "PlayPause" to WMP. + * + * @param the handle number of WMP + * + */ + + public void WMPPlayPause(int handle) + { + WinAPI.postMessage(handle, 0x000111, 0x4978, 0); + } + + + + /** + * This function send the command "stop" to WMP. + * + * @param the handle number of WMP + * + */ + + + public void WMPStop(int handle) + { + WinAPI.postMessage(handle, 0x000111, 0x4979, 0); + + } + + // public type + + + /** + * This function the string passed on argument on the keyboard. + * It send each character, one by one. + * + * The function is not incomplete. It work's with A..Z a..z, 0..9, space, enter. + * but is not guaranted with key like :/;.,?^$*tc because depending of local keyboard. + * + * @param the string to simulate on the keyboard + * + */ + + + public void TypeStringKB(String string) + { + int[] stringInt; + boolean shift = false; + boolean alt = false; + boolean control = false; + + stringInt = new int[string.length()]; + + // convert byte array to int array + + for (int i=0; i< string.length() ; i++) + { + stringInt[i] = string.codePointAt(i); + } + + + // saving capslock state + + //boolean capslock_state = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK); + + // ... and clear it + //Toolkit.getDefaultToolkit().setLockingKeyState(KeyEvent.VK_CAPS_LOCK, false); + + + for (int i=0; i< string.length() ; i++) + { + + shift = false; // this variable indicate if we shift key has to be pressed + alt = false; + control = false; + //System.out.println(stringInt[i] +" "+string.charAt(i)); + + if ((stringInt[i] >= 0x41) && (stringInt[i] <= 0x5A)) + { + shift = true; + + + } + else{ + if ((stringInt[i] >= 0x61) && (stringInt[i] <= 0x7A)) + { + // VK_A = A not a, ASCII (a - A = 0x20) + + stringInt[i]-=0x20; + }else if (stringInt[i] == ':') + { + stringInt[i] = KeyEvent.VK_COLON; + } + else if (stringInt[i] == '/') + { + shift = true; + stringInt[i] = KeyEvent.VK_COLON; + + } + else if (stringInt[i] == '\\') + { + control = alt= true; + stringInt[i] = KeyEvent.VK_LESS; + + } + else if (stringInt[i] == ' + { + stringInt[i] = KeyEvent.VK_2; + } + else if (stringInt[i] == '.') + { + // si on met directement le caract ascii . ou VK_PERIOD, cela gre une erreur + shift = true; + stringInt[i] = KeyEvent.VK_SEMICOLON; + + } + + + + } + + + if (shift) robot.keyPress(KeyEvent.VK_SHIFT); + if (alt) robot.keyPress(KeyEvent.VK_ALT); + if (control) robot.keyPress(KeyEvent.VK_CONTROL); + + robot.keyPress(stringInt[i]); + robot.keyRelease(stringInt[i]); + + if (control) robot.keyRelease(KeyEvent.VK_CONTROL); + if (shift) robot.keyRelease(KeyEvent.VK_SHIFT); + if (alt) robot.keyRelease(KeyEvent.VK_ALT); + + + } + + // Here we restore the capslock state + + //Toolkit.getDefaultToolkit().setLockingKeyState(KeyEvent.VK_CAPS_LOCK, !capslock_state); + + } + + + + /** + * This function launch WMP. + * The path of the executable of WMP and path of the audio file to play are extracted from the + * configuration (wmpPath and mediaPath) + * + * @param openfile This boolean, if true, load and play the mediafile. If false it launch WMP but don't open the file. + * + */ + + + private void launchWMP(boolean openfile){ + + String cmd = getWMPpath(); + + if (openfile) + { + cmd+=" \""+this.configuration().getMediaPath()+"\""; + } + + launchExtProgram(cmd); + + } + + + /** + * This function launch an external program (only for Windows). + * + * In case of error, a message notification is sent with the error. + * + * @param cmd The path and argument of the program + * + */ + + + private void launchExtProgram(String cmd){ + + try + { + + Runtime rt = Runtime.getRuntime(); + + + // the command is executed here + + Process p = rt.exec(cmd); + + try { + p.waitFor(); + } catch (InterruptedException e) { + throwMessageNotification(i18n.tr("Error")+": ("+e.getMessage()+")"); + } + + + + + } catch (IOException e) { + throwMessageNotification(i18n.tr("Error")+" ("+e.getMessage()+")"); + } + +} + + + + public void connectToServer(String address, int port,String login, String password, double timeout) throws noConnectionException, noRadioException, noDongleException{ + + + tux = new TuxAPI(address,port); + + //Connection to a Tuxdroid server + //tux.button.right.registerEventOnPressed(new shortcut_manager(), "onRightFlipper"); + + + tux.server.autoConnect(TuxAPIConst.CLIENT_LEVEL_RESTRICTED, login, password); + // Wait API connected + tux.server.waitConnected(timeout); + if (tux.server.getConnected()) + { + // Wait Dongle connected + tux.dongle.waitConnected(timeout); + if (tux.dongle.getConnected()) + { + //Wait Radio connected + tux.radio.waitConnected(timeout); + + if (tux.radio.getConnected()) + { + tux.access.acquire(TuxAPIConst.ACCESS_PRIORITY_HIGH); + + } + else{ + throw new noRadioException(i18n.tr("Dongle isn't connected to Tuxdroid")); + } + + + } + else{ + tux.access.acquire(TuxAPIConst.ACCESS_PRIORITY_HIGH); + throw new noDongleException(i18n.tr("Server can't connect to the dongle")); + } + } + else{ + throw new noConnectionException(i18n.tr("Can't connect to the server")); + } + } + + + /** + * Function is called by a handler when a remote button is pressed + * + * + * + * */ + + + public void remote_button(String value, Double delay) + { + //String str = String.format("OnRemoteButton %s %f", value, delay); + //System.out.println(str); + + boolean noKeyIdentified = false; // this string is used to detect a valid key, to set the focus on the windows + + + if (value.contentEquals("RELEASE") == false) + { + value=value.substring(2); + //System.out.println("Remote Button pressed : "+value); + + if (value.equals("STANDBY")) + { + + tux.destroy(); + System.exit(0); + + } + else if (value.equals("VOLUMEPLUS") || value.equals("UP")) + + { + WMPIncreaseVolume(handle); + } + else if (value.equals("VOLUMEMINUS") || value.equals("DOWN")) + { + WMPDecreaseVolume(handle); + } + else if (value.equals("PLAYPAUSE") || value.equals("OK")) + { + WMPPlayPause(handle); + } + else if (value.equals("STOP")) + { + WMPStop(handle); + } + else if (value.equals("MUTE")) + { + WMPMute(handle); + } + else if (value.equals("NEXT") || value.equals("RIGHT")) + { + WMPNext(handle); + } + else if (value.equals("PREVIOUS") || value.equals("LEFT")) + { + WMPPrevious(handle); + } + else + { + // we arrived here if the key is none of the previous + noKeyIdentified = true; + } + + if (!noKeyIdentified) + { + // put the focus if a command was sent. + handle = setFocusOnWMP(); + } + } + + } + + + + //HKEY_LOCAL_MACHINE\SOFTWARE\Clients\Media\Windows Media Player\shell\open\command + + private static final String REGQUERY_UTIL = "reg query "; + private static final String REGSTR_TOKEN = "REG_SZ"; + private static final String REGDWORD_TOKEN = "REG_DWORD"; + + + private static final String WMPPATH_CMD = REGQUERY_UTIL + + "\"HKEY_LOCAL_MACHINE\\SOFTWARE\\Clients\\Media\\Windows Media Player\\shell\\open\\command\""; + + + /** + * @return the path of Windows Media Player executable file + */ + public static String getWMPpath() { + try { + Process process = Runtime.getRuntime().exec(WMPPATH_CMD); + StreamReader reader = new StreamReader(process.getInputStream()); + + reader.start(); + process.waitFor(); + reader.join(); + + String result = reader.getResult(); + int p = result.indexOf(REGSTR_TOKEN); + + if (p == -1) + return null; + + return result.substring(p + REGSTR_TOKEN.length()).trim(); + } + catch (Exception e) { + return null; + } + } + static class StreamReader extends Thread { + private InputStream is; + private StringWriter sw; + + StreamReader(InputStream is) { + this.is = is; + sw = new StringWriter(); + } + + public void run() { + try { + int c; + while ((c = is.read()) != -1) + sw.write(c); + } + catch (IOException e) { ; } + } + + + String getResult(){ + return sw.toString(); + } + } + + + + + + + +} + + + +class noConnectionException extends Exception{ + + public noConnectionException(String message) + { + super(message); + } +} + +class noRadioException extends Exception{ + + public noRadioException(String message) + { + super(message); + } +} + +class noDongleException extends Exception{ + + public noDongleException(String message) + { + super(message); + } +} + |
From: remi <c2m...@c2...> - 2008-08-13 18:14:42
|
Author: remi Date: 2008-08-13 20:14:52 +0200 (Wed, 13 Aug 2008) New Revision: 1483 Modified: software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF Log: * updated the MANIFEST file Modified: software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF 2008-08-13 18:08:56 UTC (rev 1482) +++ software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF 2008-08-13 18:14:52 UTC (rev 1483) @@ -1,3 +1,3 @@ Manifest-Version: 1.0 Main-Class: main -Class-Path: ./tux_api.jar ./looks-2.1.4.jar attitunes_studio.jar +Class-Path: ./tux_api.jar ./looks-2.1.4.jar |
From: remi <c2m...@c2...> - 2008-08-13 18:08:59
|
Author: remi Date: 2008-08-13 20:08:56 +0200 (Wed, 13 Aug 2008) New Revision: 1482 Modified: software_suite_v2/software/tools/attitunesStudio/trunk/.classpath software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTConfig.java Log: * update Modified: software_suite_v2/software/tools/attitunesStudio/trunk/.classpath =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/.classpath 2008-08-13 17:11:59 UTC (rev 1481) +++ software_suite_v2/software/tools/attitunesStudio/trunk/.classpath 2008-08-13 18:08:56 UTC (rev 1482) @@ -3,6 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry including="*.PNG|*.att|*.png" kind="src" path="images"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="C:/tuxdroid/lib/looks-2.1.4.jar"/> + <classpathentry kind="lib" path="C:/Documents and Settings/User/Desktop/looks-2.1.4.jar"/> + <classpathentry kind="lib" path="C:/Documents and Settings/User/Desktop/tux_api.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF 2008-08-13 17:11:59 UTC (rev 1481) +++ software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF 2008-08-13 18:08:56 UTC (rev 1482) @@ -1,3 +1,3 @@ Manifest-Version: 1.0 Main-Class: main -Class-Path: ./looks-2.1.4.jar +Class-Path: ./tux_api.jar ./looks-2.1.4.jar attitunes_studio.jar Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 17:11:59 UTC (rev 1481) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 18:08:56 UTC (rev 1482) @@ -22,6 +22,7 @@ import javax.swing.BoxLayout; import javax.swing.ComboBoxModel; import javax.swing.DefaultComboBoxModel; +import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JLabel; @@ -161,6 +162,7 @@ { super(); this.blockViewer = blockViewer; + this.setIconImage(new ImageIcon(getClass().getResource("/icone.png")).getImage()); this.setTitle(ATTMessages.getString("AttitunePropertiesFrame.1")); /* Init the frame */ initGUI(); Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 17:11:59 UTC (rev 1481) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 18:08:56 UTC (rev 1482) @@ -70,6 +70,7 @@ { super(); initGUI(); + this.setIconImage(new ImageIcon(getClass().getResource("/icone.png")).getImage()); this.setTitle(ATTMessages.getString("MainFrame.1")); //$NON-NLS-1$ } @@ -258,7 +259,7 @@ setSize(648, 400); /* Load the template file */ - attBlockViewer.loadAttitune("C:/tuxdroid/resources/templates/template.att"); //$NON-NLS-1$ + attBlockViewer.loadAttitune(ATTConfig.ATT_TEMPLATE_PATH); //$NON-NLS-1$ attBlockViewer.setAttituneIsTemplate(true); /* Splash message under developpement */ @@ -318,7 +319,7 @@ } } /* Load the template */ - if (attBlockViewer.loadAttitune("C:/tuxdroid/resources/templates/template.att")) //$NON-NLS-1$ + if (attBlockViewer.loadAttitune(ATTConfig.ATT_TEMPLATE_PATH)) //$NON-NLS-1$ { attBlockViewer.setAttituneIsTemplate(true); } Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTConfig.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTConfig.java 2008-08-13 17:11:59 UTC (rev 1481) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTConfig.java 2008-08-13 18:08:56 UTC (rev 1482) @@ -97,4 +97,6 @@ EVENT_ATTITUNE_LOADED, EVENT_ATTITUNE_SAVED, }; + + public static String ATT_TEMPLATE_PATH = "C:/tuxdroid/resources/templates/template.att"; } \ No newline at end of file |
From: remi <c2m...@c2...> - 2008-08-13 17:11:50
|
Author: remi Date: 2008-08-13 19:11:59 +0200 (Wed, 13 Aug 2008) New Revision: 1481 Modified: software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/lib/httpserver/TDAccessController.py Log: * fixed a bug in the ROOT client Modified: software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/lib/httpserver/TDAccessController.py =================================================================== --- software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/lib/httpserver/TDAccessController.py 2008-08-13 16:34:13 UTC (rev 1480) +++ software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/lib/httpserver/TDAccessController.py 2008-08-13 17:11:59 UTC (rev 1481) @@ -18,7 +18,7 @@ TDAC_ID_RANGE_ANONYMOUS = range(-1, 0) TDAC_ID_RANGE_FREE_CLIENT = range(1, 254) TDAC_ID_RANGE_RESTRICTED_CLIENT = range(255, 65534) -TDAC_ID_RANGE_ROOT = range(65535, 65535) +TDAC_ID_RANGE_ROOT = range(65535, 65536) ACCESS_PRIORITY_LOW = 0 ACCESS_PRIORITY_NORMAL = 1 |
From: remi <c2m...@c2...> - 2008-08-13 16:34:04
|
Author: remi Date: 2008-08-13 18:34:13 +0200 (Wed, 13 Aug 2008) New Revision: 1480 Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties Log: * added a title in the dialog messages Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 16:33:10 UTC (rev 1479) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 16:34:13 UTC (rev 1480) @@ -161,6 +161,7 @@ { super(); this.blockViewer = blockViewer; + this.setTitle(ATTMessages.getString("AttitunePropertiesFrame.1")); /* Init the frame */ initGUI(); /* Fill the parameters */ @@ -591,8 +592,10 @@ List<String> badParams = blockViewer.checkHeader(); if (badParams.size() > 0) { - JOptionPane.showMessageDialog(this, - ATTMessages.getString("AttitunePropertiesFrame.80")); //$NON-NLS-1$ + JOptionPane.showMessageDialog(this, + ATTMessages.getString("AttitunePropertiesFrame.80"), + ATTMessages.getString("AttitunePropertiesFrame.1"), + JOptionPane.INFORMATION_MESSAGE); return; } } @@ -620,8 +623,10 @@ List<String> badParams = blockViewer.checkHeader(); if (badParams.size() > 0) { - JOptionPane.showMessageDialog(this, - ATTMessages.getString("AttitunePropertiesFrame.80")); //$NON-NLS-1$ + JOptionPane.showMessageDialog(this, + ATTMessages.getString("AttitunePropertiesFrame.80"), + ATTMessages.getString("AttitunePropertiesFrame.1"), + JOptionPane.INFORMATION_MESSAGE); } } Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 16:33:10 UTC (rev 1479) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 16:34:13 UTC (rev 1480) @@ -12,6 +12,7 @@ import java.util.List; import javax.swing.*; + import com.tuxisalive.attitunes.*; import com.tuxisalive.attitunes.format.*; import com.tuxisalive.attitunes.block.ATTBlock; @@ -261,7 +262,10 @@ attBlockViewer.setAttituneIsTemplate(true); /* Splash message under developpement */ - JOptionPane.showMessageDialog(this, ATTMessages.getString("MainFrame.98")); + JOptionPane.showMessageDialog(this, + ATTMessages.getString("MainFrame.98"), + ATTMessages.getString("MainFrame.1"), + JOptionPane.INFORMATION_MESSAGE); } catch (Exception e) { @@ -306,7 +310,7 @@ int result = JOptionPane.showConfirmDialog( this, ATTMessages.getString("MainFrame.97"), //$NON-NLS-1$ - ATTMessages.getString("MainFrame.72"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.1"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -332,7 +336,7 @@ int result = JOptionPane.showConfirmDialog( this, ATTMessages.getString("MainFrame.97"), //$NON-NLS-1$ - ATTMessages.getString("MainFrame.72"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.1"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -354,7 +358,10 @@ if (attBlockViewer.loadAttitune(selFile.getPath())) { attBlockViewer.setAttituneIsTemplate(false); - JOptionPane.showMessageDialog(this, ATTMessages.getString("MainFrame.77")); //$NON-NLS-1$ + JOptionPane.showMessageDialog(this, + ATTMessages.getString("MainFrame.77"), + ATTMessages.getString("MainFrame.1"), + JOptionPane.INFORMATION_MESSAGE); } } } @@ -368,8 +375,10 @@ List<String> badParams = attBlockViewer.checkHeader(); if (badParams.size() > 0) { - JOptionPane.showMessageDialog(this, - ATTMessages.getString("MainFrame.78")); //$NON-NLS-1$ + JOptionPane.showMessageDialog(this, + ATTMessages.getString("MainFrame.78"), + ATTMessages.getString("MainFrame.1"), + JOptionPane.INFORMATION_MESSAGE); confirmExit = false; return; } @@ -394,8 +403,10 @@ List<String> badParams = attBlockViewer.checkHeader(); if (badParams.size() > 0) { - JOptionPane.showMessageDialog(this, - ATTMessages.getString("MainFrame.78")); //$NON-NLS-1$ + JOptionPane.showMessageDialog(this, + ATTMessages.getString("MainFrame.78"), + ATTMessages.getString("MainFrame.1"), + JOptionPane.INFORMATION_MESSAGE); return; } /* Open a file viewer to select an attitune */ @@ -448,7 +459,7 @@ int result = JOptionPane.showConfirmDialog( this, ATTMessages.getString("MainFrame.97"), //$NON-NLS-1$ - ATTMessages.getString("MainFrame.72"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.1"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -614,7 +625,10 @@ */ public void onAttituneSaved(ATTBlockViewer bv) { - JOptionPane.showMessageDialog(this, ATTMessages.getString("MainFrame.93")); //$NON-NLS-1$ + JOptionPane.showMessageDialog(this, + ATTMessages.getString("MainFrame.93"), + ATTMessages.getString("MainFrame.1"), + JOptionPane.INFORMATION_MESSAGE); } /* ------------------------------------------------------------------------ @@ -667,7 +681,7 @@ int result = JOptionPane.showConfirmDialog( this, ATTMessages.getString("MainFrame.95"), //$NON-NLS-1$ - ATTMessages.getString("MainFrame.96"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.1"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties 2008-08-13 16:33:10 UTC (rev 1479) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties 2008-08-13 16:34:13 UTC (rev 1480) @@ -18,6 +18,7 @@ MainFrame.95=You are sure that do you want deleting this block ? MainFrame.96=Block deleting MainFrame.98=Attitunes studio is still under developpement +AttitunePropertiesFrame.1=Attitunes studio - Properties AttitunePropertiesFrame.55=The parameters marked as red color are missing. AttitunePropertiesFrame.56=Name : AttitunePropertiesFrame.57=Author : |
From: remi <c2m...@c2...> - 2008-08-13 16:33:00
|
Author: remi Date: 2008-08-13 18:33:10 +0200 (Wed, 13 Aug 2008) New Revision: 1479 Removed: software_suite_v2/software/tools/attitunesStudio/trunk/images/Thumbs.db Log: * deleted Thumbs.db Deleted: software_suite_v2/software/tools/attitunesStudio/trunk/images/Thumbs.db =================================================================== (Binary files differ) |
From: remi <c2m...@c2...> - 2008-08-13 16:31:25
|
Author: remi Date: 2008-08-13 18:31:29 +0200 (Wed, 13 Aug 2008) New Revision: 1478 Added: software_suite_v2/software/tools/attitunesStudio/trunk/images/icone.png Log: * added the icon Added: software_suite_v2/software/tools/attitunesStudio/trunk/images/icone.png =================================================================== (Binary files differ) Property changes on: software_suite_v2/software/tools/attitunesStudio/trunk/images/icone.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
From: remi <c2m...@c2...> - 2008-08-13 15:36:23
|
Author: remi Date: 2008-08-13 17:24:13 +0200 (Wed, 13 Aug 2008) New Revision: 1477 Modified: software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties Log: * updated MANIFEST file and a message box which notify that the tool is under developement Modified: software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF 2008-08-13 15:03:36 UTC (rev 1476) +++ software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF 2008-08-13 15:24:13 UTC (rev 1477) @@ -1,3 +1,3 @@ Manifest-Version: 1.0 Main-Class: main -Class-Path: ./attitunesStudio.jar; ./looks-2.1.4.jar +Class-Path: ./looks-2.1.4.jar Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 15:03:36 UTC (rev 1476) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 15:24:13 UTC (rev 1477) @@ -259,6 +259,9 @@ /* Load the template file */ attBlockViewer.loadAttitune("C:/tuxdroid/resources/templates/template.att"); //$NON-NLS-1$ attBlockViewer.setAttituneIsTemplate(true); + + /* Splash message under developpement */ + JOptionPane.showMessageDialog(this, ATTMessages.getString("MainFrame.98")); } catch (Exception e) { Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties 2008-08-13 15:03:36 UTC (rev 1476) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties 2008-08-13 15:24:13 UTC (rev 1477) @@ -17,6 +17,7 @@ MainFrame.93=Your attitune has been saved MainFrame.95=You are sure that do you want deleting this block ? MainFrame.96=Block deleting +MainFrame.98=Attitunes studio is still under developpement AttitunePropertiesFrame.55=The parameters marked as red color are missing. AttitunePropertiesFrame.56=Name : AttitunePropertiesFrame.57=Author : |
From: jaguarondi <c2m...@c2...> - 2008-08-13 15:03:30
|
Author: jaguarondi Date: 2008-08-13 17:03:36 +0200 (Wed, 13 Aug 2008) New Revision: 1476 Added: firmware/fuxusb/branches/new_rf/AUTHORS firmware/fuxusb/branches/new_rf/CHANGES firmware/fuxusb/branches/new_rf/COPYING firmware/fuxusb/branches/new_rf/README firmware/fuxusb/branches/new_rf/src/Makefile firmware/fuxusb/branches/new_rf/src/svnrev.tmpl.h Modified: firmware/fuxusb/branches/new_rf/src/global.c firmware/fuxusb/branches/new_rf/src/usb_commands.c firmware/fuxusb/branches/new_rf/src/version.h Log: * Merged last changes from trunk and bumped to version 0.6.0 (SVN/UNRELEASED). Copied: firmware/fuxusb/branches/new_rf/AUTHORS (from rev 1459, firmware/fuxusb/trunk/AUTHORS) =================================================================== --- firmware/fuxusb/branches/new_rf/AUTHORS (rev 0) +++ firmware/fuxusb/branches/new_rf/AUTHORS 2008-08-13 15:03:36 UTC (rev 1476) @@ -0,0 +1,10 @@ +$Id: AUTHORS 492 2007-09-06 12:54:06Z jaguarondi $ + +FUXUSB was written by: + + Paul Rathgeb <pau...@c2...> + Raphael Lamy <rap...@c2...> + +Contributors: + + David Bourgeois <da...@ja...> Copied: firmware/fuxusb/branches/new_rf/CHANGES (from rev 1459, firmware/fuxusb/trunk/CHANGES) =================================================================== --- firmware/fuxusb/branches/new_rf/CHANGES (rev 0) +++ firmware/fuxusb/branches/new_rf/CHANGES 2008-08-13 15:03:36 UTC (rev 1476) @@ -0,0 +1,42 @@ +$Id$ + +Approximate change log for FUXUSB by version. + +(For more detailed changes, see svn log.) + +---------------------------------------------------------------------- +Current: + +Version 0.5.0: + + * Major cleanup of the USB code, finally up-to-date on SVN. + + * Lots of bug fixes. + + * Can be compiled in HID or libusb mode. + + * Improved the bootloader mode. + + * Added doxygen documentation. + + * Versioning is available through dongle commands and not standard commands. + +Version 0.4.0: + + * Changed the descriptor, some errors have been corrected for the audio + endpoint and audio seems to behave better now, at least skype can open the + tuxdroid device correctly. + + * The dongle now resets after bootloading so unplugging is not necessary + anymore. + + * Added a command to reset the dongle (raw : 1, 1, 0, 0, 0xFE). + This command detach and attach the USB and resets the uC. The RF will also + be reseted during the enum process. + + * Refactoring of parts of the code, especially bank management. This should + prevent some bugs in the future when the daemon will change. + + * Fixed some bugs with the version number section and the eeprom programming. + + * Added some protections for bootloading. Copied: firmware/fuxusb/branches/new_rf/COPYING (from rev 1459, firmware/fuxusb/trunk/COPYING) =================================================================== --- firmware/fuxusb/branches/new_rf/COPYING (rev 0) +++ firmware/fuxusb/branches/new_rf/COPYING 2008-08-13 15:03:36 UTC (rev 1476) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 Library General +Public License instead of this License. Copied: firmware/fuxusb/branches/new_rf/README (from rev 1459, firmware/fuxusb/trunk/README) =================================================================== --- firmware/fuxusb/branches/new_rf/README (rev 0) +++ firmware/fuxusb/branches/new_rf/README 2008-08-13 15:03:36 UTC (rev 1476) @@ -0,0 +1,10 @@ +$Id$ + +FUXUSB is the firmware of the USB CPU of Tux Droid. +The CPU is an AT89C5130 from Atmel. This firmware can't be compiled with an +open source compiler. + +For all information about tuxdroid, please visit: + + http://www.tuxisalive.com + Copied: firmware/fuxusb/branches/new_rf/src/Makefile (from rev 1455, firmware/fuxusb/trunk/src/Makefile) =================================================================== --- firmware/fuxusb/branches/new_rf/src/Makefile (rev 0) +++ firmware/fuxusb/branches/new_rf/src/Makefile 2008-08-13 15:03:36 UTC (rev 1476) @@ -0,0 +1,30 @@ +# Makefile - GNU Makefile for TUXCORE +# +# TUXCORE - Firmware for the 'core' CPU of tuxdroid +# Copyright (C) 2007 C2ME S.A. <tux...@c2...> +# +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# $Id$ + +## Build +all: svnrev.h + +## Generate SVN info +# We need to change the status each time a file changes, thus so many +# dependencies +svnrev.h: $(CSOURCE) $(HEADERS) + svnwcrev . svnrev.tmpl.h svnrev.h Modified: firmware/fuxusb/branches/new_rf/src/global.c =================================================================== --- firmware/fuxusb/branches/new_rf/src/global.c 2008-08-13 14:04:29 UTC (rev 1475) +++ firmware/fuxusb/branches/new_rf/src/global.c 2008-08-13 15:03:36 UTC (rev 1476) @@ -46,8 +46,9 @@ /** \name Dongle infos * @{ */ -code version_t info_version ={VERSION_CMD, CPU_VER_JOIN(FUXUSB_CPU_NUM, VER_MAJOR), VER_MINOR, VER_UPDATE}; -code revision_t info_revision={REVISION_CMD, REVISION_NUMBER, RELEASE_TYPE}; +code version_t info_version ={VERSION_CMD, + CPU_VER_JOIN(FUXUSB_CPU_NUM, VER_MAJOR), VER_MINOR, VER_UPDATE}; +code revision_t info_revision={REVISION_CMD, SVN_REV, RELEASE_TYPE}; code author_t info_author={AUTHOR_CMD, AUTHOR_ID, VARIATION}; /* @} */ Copied: firmware/fuxusb/branches/new_rf/src/svnrev.tmpl.h (from rev 1455, firmware/fuxusb/trunk/src/svnrev.tmpl.h) =================================================================== --- firmware/fuxusb/branches/new_rf/src/svnrev.tmpl.h (rev 0) +++ firmware/fuxusb/branches/new_rf/src/svnrev.tmpl.h 2008-08-13 15:03:36 UTC (rev 1476) @@ -0,0 +1,38 @@ +/* + * TUXCORE - Firmware for the 'core' CPU of tuxdroid + * Copyright (C) 2007 C2ME S.A. <tux...@c2...> + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* $Id$ */ + +/* This file is a template to generate svnrev.h automatically. + * SubWCRev performs keyword susbstitution whith SVN information. + */ + +#ifndef _SVNREV_H_ +#define _SVNREV_H_ + +#define SVN_REV $WCREV$ +#define SVN_REVSTR "$WCREV$" +#define SVN_REVDATE "$WCDATE$" +#define SVN_MOD $WCMODS?1:0$ +#define SVN_MIX $WCMIXED?1:0$ +#define SVN_STATUS (SVN_MOD + (SVN_MIX<<1)) +#define SVN_RANGE "$WCRANGE$" +#define SVN_URL "$WCURL$" + +#endif /* _SVNREV_H_ */ Modified: firmware/fuxusb/branches/new_rf/src/usb_commands.c =================================================================== --- firmware/fuxusb/branches/new_rf/src/usb_commands.c 2008-08-13 14:04:29 UTC (rev 1475) +++ firmware/fuxusb/branches/new_rf/src/usb_commands.c 2008-08-13 15:03:36 UTC (rev 1476) @@ -243,14 +243,14 @@ /* Revision */ FIFO_STT_put(info_revision.revision_cmd); + FIFO_STT_put((info_revision.revision&0x00FF)); FIFO_STT_put((info_revision.revision&0xFF00)>>8); - FIFO_STT_put((info_revision.revision&0x00FF)); FIFO_STT_put(info_revision.release_type); /* Author */ FIFO_STT_put(info_author.author_cmd); + FIFO_STT_put((info_author.author_id&0x00FF)); FIFO_STT_put((info_author.author_id&0xFF00)>>8); - FIFO_STT_put((info_author.author_id&0x00FF)); FIFO_STT_put(info_author.variation); status_requested = True; Modified: firmware/fuxusb/branches/new_rf/src/version.h =================================================================== --- firmware/fuxusb/branches/new_rf/src/version.h 2008-08-13 14:04:29 UTC (rev 1475) +++ firmware/fuxusb/branches/new_rf/src/version.h 2008-08-13 15:03:36 UTC (rev 1476) @@ -24,18 +24,24 @@ #ifndef _VERSION_H_ #define _VERSION_H_ +#include "svnrev.h" + /* * Version number */ #define VER_MAJOR 0 -#define VER_MINOR 4 -#define VER_UPDATE 1 +#define VER_MINOR 6 +#define VER_UPDATE 0 +/** RELEASE should be set to '1' prior to tagging a release, and reset + * immediately after. It's like appending (SVN_UNRELEASED) to a version number + * when equal to '0'. */ +#define RELEASE 0 + #define AUTHOR_ID 0 /* official release */ #define VARIATION 0 /* generic firmware */ -#define REVISION_NUMBER 0 /* XXX find a way to define this automatically in \ - the Makefile from SVN */ -#define RELEASE_TYPE 0x04 +#define RELEASE_TYPE (SVN_STATUS | (RELEASE << 2)) + #endif /* _VERSION_H_ */ |
From: jaguarondi <c2m...@c2...> - 2008-08-13 14:04:20
|
Author: jaguarondi Date: 2008-08-13 16:04:29 +0200 (Wed, 13 Aug 2008) New Revision: 1475 Modified: firmware/hex_dev/new_rf/fuxusb.hex Log: * Now supports 8kHz TTS. Modified: firmware/hex_dev/new_rf/fuxusb.hex =================================================================== --- firmware/hex_dev/new_rf/fuxusb.hex 2008-08-13 14:03:52 UTC (rev 1474) +++ firmware/hex_dev/new_rf/fuxusb.hex 2008-08-13 14:04:29 UTC (rev 1475) @@ -1,18 +1,18 @@ -:1018000012190F12109D30090512104E80F51209A1 -:031810000780F05E -:0C190F00438F01C281D2A3D2AF020EA40C -:0C191B00C8040401C9000004CA00000058 -:060EA400121A4043BC805D +:1018160012192512109D30090512104E80F5120975 +:031826000780F048 +:0C192500438F01C281D2A3D2AF020EA4F6 +:0C193100C8040401C9000004CA00000042 +:060EA400121A6143BC803C :100EAA009001AC1201EE0000271043BC109001AC77 :100EBA00E0FCA3E0FDA3E0FEA3E0FFEC4D4E4F6093 :100ECA0018EF24FFFFEE34FFFEED34FFFDEC34FF94 :0C0EDA00FC9001AC1201E280D453BCEF8C -:100EE6007D80E4FF121A39E4FF12188C1217AA53F8 +:100EE6007D80E4FF121A5AE4FF1218A21217AC53BF :080EF600F1FC43F101D2B3222B -:10109D00E5BD30E5051218F58012E5BD30E4051209 -:1010AD0019E78008E5BD30E0031219DEE5BD30E338 +:10109D00E5BD30E50512190B8012E5BD30E40512F2 +:1010AD001A088008E5BD30E0031219FFE5BD30E3F5 :1010BD000E53BDF71215979000FCE0600214F090EE -:1010CD0001A4E0600B1218CA500620050312196323 +:1010CD0001A4E0600B1218E05006200503121979F7 :0B10DD00120DD7E5F860031212C422C8 :0415BD004101A40044 :100EFE00E5CFF0A3E5CFF0A3E5CFF0A3E5CFF02249 @@ -21,40 +21,40 @@ :100F2E0001A6E0FBA3E0FAA3E0F92253CE7F53CE55 :100F3E00FB229001A1E4F0A322F053CEFB43CE108E :080F4E0022E4F5CF43CE10228E -:1017AA00E49001AAF0A3F0A3F09001A4F09001CE76 -:0617BA00F09001CDF022C9 -:100006007D857F01121A397F0112188C7D817F024E -:10001600121A397F0212188C7D817F03121A397FDA -:100026000312188C7D877F04121A397F0412188CEC -:0C0036007D837F05121A397F0502188CAB -:061A4E00E4F5C7020B04E1 +:1017AC00E49001AAF0A3F0A3F09001A4F09001CE74 +:0617BC00F09001CDF022C7 +:100006007D857F01121A5A7F011218A27D817F0217 +:10001600121A5A7F021218A27D817F03121A5A7F82 +:10002600031218A27D877F04121A5A7F041218A29F +:0C0036007D837F05121A5A7F050218A274 +:061A6F00E4F5C7020B04C0 :100B04009001A5E5CFF09001A3E5CFF09001A5E019 :100B1400546070739001A3E024FEB40A0050669000 :100B24000B3175F003A4C58325F0C58373020B84D0 :100B3400020B89020B89020B59020B4F020B89022B :100B44000B54020B5E020B6E020B7F120621806FA8 -:100B54001216B0806A12179280659001A5E07005A4 -:100B64001214D0805A12189D80559001A5E0B481CA -:100B7400051219B680491218D98044120E40803FDC -:100B84001217C0803A80329001A5E054606420704E +:100B54001216B0806A12179480659001A5E07005A2 +:100B64001214D0805A1218B380559001A5E0B481B4 +:100B7400051219D780491218EF8044120E40803FA5 +:100B84001217C2803A80329001A5E054606420704C :100B9400289001A3E0247E600F14601114601324D4 :100BA4000370141216CE80171216EC801212166EF1 -:100BB400800D12168F8008800053CEFB1218AC53A0 +:100BB400800D12168F8008800053CEFB1218C2538A :030BC400CE7F22BF -:101792009001ACE5CFF053CEFB43BC011219579038 -:0717A20001ACE04480F5C634 -:0117A900221D +:101794009001ACE5CFF053CEFB43BC0112196D9020 +:0717A40001ACE04480F5C632 +:0117AB00221B :1014D000AFCF120F39EFD39401501B9001A4EFF05E -:1014E000B4010912154B12164B1219C012195712DA -:0914F000000643BC02221218ACF4 +:1014E000B4010912154B12164B1219E112196D12A3 +:0914F000000643BC02221218C2DE :0114F90022D0 :100E40009001AC120EFE120F399001AEE0B40318FF :100E50009001ACE070129001CEF09001CDF07F04D3 -:100E600012188C7F0512188C9001AEE0B4010C9022 -:100E700001ACE0B401057F8112188C9001AEE0B4A2 -:100E8000020C9001ACE0B401057F0212188C9001B5 +:100E60001218A27F051218A29001AEE0B4010C90F6 +:100E700001ACE0B401057F811218A29001AEE0B48C +:100E8000020C9001ACE0B401057F021218A290019F :100E9000AEE0B4050C9001ACE0B401057F0312187C -:040EA0008C02195750 +:040EA000A202196D24 :10062100C20AAFCFAECFEE24FE60171460292402B8 :100631006003020711120F0E7402F0A3744BF00253 :10064100071B9001A17401F07420120F157403F0BF @@ -70,7 +70,7 @@ :1006E1007422120F167402F0A374ABF0802C120F57 :1006F10040741A120F167402F0A374EBF0801B12EF :100701000F40741E120F167403F0A37405F0800AD3 -:1007110053CEFB1218AC53CE7F22E5CFE5CF90012B +:1007110053CEFB1218C253CE7F22E5CFE5CF900115 :10072100ADE5CFF09001ACE5CFF09001A1E0FEA3E3 :10073100E0FF9001ACE0FCA3E0FDD39FEC9E400CF8 :10074100EF541F60028001D3920A80089001A1EC4E @@ -81,14 +81,14 @@ :100791007005E5CE30E2F5E5CE20E20CE5CE54421F :0807A100600653CE7F53CEFD2C :0107A900222D -:1011BD009001AEEDF01218259001A6EBF0A3EAF028 +:1011BD009001AEEDF012183B9001A6EBF0A3EAF012 :1011CD00A3E9F09001AEE0FFC39001A2E09FF09083 :1011DD0001A1E09400F0E5CE54427005E5CE30E07B :1011ED00F553CEFEE5CE5442600853CEEF53CEFDFF :0411FD00C322D32214 :1016B000120F1F9001A4E0F5CF43CE10E5CE30E02D :0E16C000FB53CEFEE5CE544260FA120F2622F6 -:0A19B600120F1F1218AC53CE7F224F +:0A19D700120F1F1218C253CE7F2218 :100FFE00E5CFE5CFAFCF120F1F9001A5E0247F60A4 :10100E000C14600E2402701975CF018014E4F5CF14 :10101E00800FEF547F24A9F582E43401F583E0F5C7 @@ -99,13 +99,13 @@ :101141002E9001A5E06402702CE5CF7028E5CFAFA9 :10115100CFEF247F701975C70143CE20E4F5C79006 :1011610001AA04120F47E5CE30E0FB53CEFE225315 -:06117100CEFB1218AC22B7 +:06117100CEFB1218C222A1 :100F56009001A5E0700280479001A5E0B4010280EF :100F66003E9001A5E06402703CE5CF7038E5CFAF56 :100F7600CFEF601F247F702775C70153CEDF7F0137 -:100F860012188CE4F5C79001AA120F47E5CE30E09F +:100F86001218A2E4F5C79001AA120F47E5CE30E089 :100F9600FB8008120F48E5CE30E0FB53CEFE22530D -:060FA600CEFB1218AC2284 +:060FA600CEFB1218C2226E :1016CE009001AC120EFE120F1F120F4FE5CE30E03E :0D16DE00FB53CEFEE5CE544260FA120F26FB :0116EB0022DC @@ -118,16 +118,16 @@ :10168F009001AC120EFE120F1F75CF0143CE10E565 :10169F00CE30E0FB53CEFEE5CE544260FA120F2659 :0116AF002218 -:0C1927009001B9120EFE120F3902195780 -:0C1933009001BD120EFE120F3902195770 -:0C193F009001C1120EFE120F3902195760 -:0C194B009001C5120EFE120F3902195750 -:0F189D0053CEFBE5CE544260FA53CEFD021957ED -:0E18D900E5CF9001A0E5CFF053CEFB021957EA -:1017C000120F1F9001A0E0F5CF121957E5CE544239 -:0617D00060FA120F262250 -:0F18AC0043CE20E5CE30E3FB53CEDF53CEF72201 -:0C19570043CE10E5CE30E0FB53CEFE2264 +:0C193D009001B9120EFE120F3902196D54 +:0C1949009001BD120EFE120F3902196D44 +:0C1955009001C1120EFE120F3902196D34 +:0C1961009001C5120EFE120F3902196D24 +:0F18B30053CEFBE5CE544260FA53CEFD02196DC1 +:0E18EF00E5CF9001A0E5CFF053CEFB02196DBE +:1017C200120F1F9001A0E0F5CF12196DE5CE544221 +:0617D20060FA120F26224E +:0F18C20043CE20E5CE30E3FB53CEDF53CEF722EB +:0C196D0043CE10E5CE30E0FB53CEFE224E :10024B001201100100000020EB0307FF4100010227 :10025B00030112030904000000000000000000006D :10026B00000000000C034B00790073006F00680066 @@ -161,18 +161,18 @@ :10042B000101010801401F0009050301080001003B :08043B0000072501000000008C :0615C100C106C107C105CF -:1012C400E5F830E00BE4F5C7E5CE30E203121A4E40 -:1012D400E5F830E1031218E7E5F830E2031217EB02 -:1012E400E5F830E3031217D6E5F830E403121605E7 +:1012C400E5F830E00BE4F5C7E5CE30E203121A6F1F +:1012D400E5F830E1031218FDE5F830E2031217EDEA +:1012E400E5F830E3031217D8E5F830E403121605E5 :0C12F400E5F830E5061212011213AB22DF -:101813009001CEE0600B75C704E5CE20E40343CE10 -:02182300102291 -:0C19630075C70112172843CE10D20522D0 -:0E18E70075C701E5CE30E00553CEFEC20522E6 -:1017D60075C70330060B121A7EEF60057F081217D5 -:0517E6004453CEFD227A -:1017EB0075C70220060B121A7EEF60057F101217C9 -:0517FB004453CEFD2265 +:101829009001CEE0600B75C704E5CE20E40343CEFA +:0218390010227B +:0C19790075C70112174543CE10D205229D +:0E18FD0075C701E5CE30E00553CEFEC20522D0 +:1017D80075C70330060B121A9FEF60057F081217B2 +:0517E8002853CEFD2294 +:1017ED0075C70220060B121A9FEF60057F101218A5 +:0517FD000253CEFD22A5 :1013AB0075C7059001CDE0FF700CE5CE30E107531A :1013BB00CEFD7401F022EFB4010EE5CE30E60953F9 :1013CB00CEBFE49001CDF022E5CE30E60453CEBF84 @@ -183,7 +183,7 @@ :10162800EF24FFFFEE34FFFEED34FFFDEC34FFFC4A :101638000201E2E0FCA3E0FDA3E0FEA3E0FFEC4D25 :031648004E4F22E0 -:1012010075C705E5CE5442603A121A7EEF1490007C +:1012010075C705E5CE5442603A121A9FEF1490005B :10121100FBF0AFCFE4FE9000FBE0FDEEC39D50106C :1012210074BB2EF582E43400F583E5CFF00E80E641 :10123100EF600A24FE6009047009020A40D2032209 @@ -192,24 +192,24 @@ :100DD7003007659001CEE0C39402505C75C704E408 :100DE700F5CF30A303FF80027F018FCF9000FEE095 :100DF700F5CFE51060071313543FFF80027F008F84 -:100E0700CFE4F517E517C3951050091218488FCF8F +:100E0700CFE4F517E517C39510500912185E8FCF79 :100E1700051780F0851017E517C3943C5007E4F5D4 -:100E2700CF051780F21219C09001CEE004F0121816 -:080E370013E49000FEF0C20775 +:100E2700CF051780F21219E19001CEE004F01218F5 +:080E370029E49000FEF0C2075F :010E3F002290 :1015230075C70475CFF0EF60047F0080027F018FE1 :10153300CFAF058FCFAF038FCF9001B0E0F5CF9042 -:0815430001CEE004F0021813D0 +:0815430001CEE004F0021829BA :100A40009000BBE07001229000BBE0B40120900058 :100A5000BEE02403600F14600F14600F14600302E3 :100A60000AE7D2072202154B0213E00210E89000B9 :100A7000BBE0B4020DA3E0600614706BD20622C284 -:100A800006229000BBE06406705D1219C090191B2D -:100A9000120AE890191C120AE890191D120AEF9028 -:100AA000191E120AEF90191F120AF6901920120A45 -:100AB000F6901920E4740193FF12170A901922127C -:100AC0000AFD901923120AFD901924E493FF1217CE -:100AD0000A901924E4740193FF12170A901926E46E +:100A800006229000BBE06406705D1219E1901931F6 +:100A9000120AE8901932120AE8901933120AEF90FC +:100AA0001934120AEF901935120AF6901936120A03 +:100AB000F6901936E4740193FF12170A9019381250 +:100AC0000AFD901939120AFD90193AE493FF1217A2 +:100AD0000A90193AE4740193FF12170A90193CE442 :100AE00093FF12170AD20722E493FF12170A22E497 :100AF00093FF12170A22E493FF12170A22E493FFCE :040B000012170A229C @@ -218,18 +218,18 @@ :1013FA0012163B60089001AC12162880F053BCEF1D :0A140A00D2B375A61E75A6E180FEA0 :1010E800E4F5A8F5B175C314D2B3C2817B067D01BE -:0E10F8007F0412175F7B017DF47F0412175FE7 +:0E10F8007F041217617B017DF47F04121761E3 :101106009001AC1201EE0000271043BC109001AC18 :1011160012163B60089001AC12162880F053BCEF03 -:0B112600121A2375A61E75A6E180FEBC -:0919DE0053BDFE43BC40C281224E -:0D18F50053BCBF53BDFE53BDDF53BDF722F2 -:0919E70053BDEF1217AA0219C04A +:0B112600121A4475A61E75A6E180FE9B +:0919FF0053BDFE43BC40C281222D +:0D190B0053BCBF53BDFE53BDDF53BDF722DB +:091A080053BDEF1217AC0219E105 :0C15C700C181C104C102C1004100FD004F :1015E10090014FE02406FFE433FE900152E022E433 :1015F100900151F0900150F022F582E43401F5831D :04160100E0F5C52229 -:0C196F001215F0D201D291C202C2042273 +:0C1985001215F0D201D291C202C204225D :10164B0053AFFE43C31043C30253C3F753C3FB4310 :10165B00C32043C340D2B2D2B4D291D288D2A81203 :03166B0015F02255 @@ -257,7 +257,7 @@ :1009E70000FDF0E49001ACF09001ACE0FF24BBF512 :1009F70082E43400F583E0FE74282FF582E43401A5 :100A0700F583EEF09001ACE004F0E0B404DA121ADA -:100A170032EFC394219000FDE040104404F07B01C5 +:100A170053EFC394219000FDE040104404F07B01A4 :100A27007A01792C7D21121375800354FBF0900015 :060A3700FDE0900127F034 :020A3D00C2B63F @@ -270,7 +270,7 @@ :1004930001517402F090014EE020E1398034900163 :1004A30051E0FF64027027A3E0FEB4150F90014EE4 :1004B300E030E302C2039001517403F090014EE077 -:1004C30030E30974062EF8E6F5C580098004EFB41D +:1004C30030E30974D02EF8E6F5C580098004EFB453 :1004D3000303E4F5C5900152E004F0900150E0FFFE :1004E3007030AEC4BE8003D38001C350F530A30384 :1004F30002062090014DE5C5F0E5C590014F30E7B8 @@ -299,13 +299,13 @@ :1014340083EFF09001ACE004F022E49001B0F0FB03 :011444002285 :100CEC009000BBE0B40105121286803120090E126F -:100CFC00143E7D01FF121523121A0B80209000BBAD -:100D0C00E0B4030F121A0B12143E7DFE7F01121574 +:100CFC00143E7D01FF121523121A2C80209000BB8C +:100D0C00E0B4030F121A2C12143E7DFE7F01121553 :100D1C0023800A9000BBE0B40203120BC79001952C :100D2C00E0FF90019CE0FEB5072590019FE0FD904F :100D3C000194E0B5051990019EE02DF090019DE025 :100D4C003400F0E4900194F090019CF0D20822EE73 -:100D5C00C39F400C12143E7D05FF121523121A0B73 +:100D5C00C39F400C12143E7D05FF121523121A2C52 :010D6C002264 :10104E009000FCE0704830084578AC7C017D017B57 :10105E00017A0179967E007F061201169001B27414 @@ -318,38 +318,38 @@ :100BF700FEA3E0FFEE547FFC90019DE06C7003A321 :100C0700E06F6024EF64C07003EE641D601A90010A :100C170097E0640E7004A3E064C0600C12143E7D7C -:100C270003FF121523121A0B9001AC7403F0900105 +:100C270003FF121523121A2C9001AC7403F09001E4 :100C3700ACE0FFC39423501A12141480F19001AC56 :100C47007401F09001ACE0FFC39421500512141415 :080C570080F190019CE004F023 :010C5F002272 -:101286009000FC74FAF01218371215719000BCE049 +:101286009000FC74FAF012184D1215719000BCE033 :1012960025E0900196F09000BDE090019FF090004F :1012A600BEE0900195F0E490019DF0A3F0900194CA :0E12B600F090019CF0900193F0D209C2A822A2 -:081A0B00C20912154B02196F0C -:10183700121A65121A2B90019A7400F0A37403F020 -:01184700227E +:081A2C00C20912154B021985D5 +:10184D00121A86121A4C90019A7400F0A37403F0C8 +:01185D002268 :1014A400900097E054BFF09001ACE0900098F09069 :1014B40001ADE0FCA3E0FDEC900001F0A3EDF090A1 -:0C14C40001B2E02402900096F00218BB78 +:0C14C40001B2E02402900096F00218D162 :1011770090008AE0FF04F0748B2FF582E43400F5C9 :1011870083E595F022E0FF04F074012FF582E43443 :1011970000F58322900096E0FF900000E0C39F22B5 :1011A700E0FBA3E0FAA3E0F9EA494B22A3E0FAA3A4 :0611B700E0F5828A8322AC -:041A650075938022D3 -:071A2B007593C043B10222D4 -:0C197B00900083EBF0A3EAF0A3E9F02257 -:0C198700900087EBF0A3EAF0A3E9F02247 -:0F18BB00900097E04401F0E4900000F0021A69F9 -:041A69004393202261 -:0B19AB00439310900097E054FEF022E0 -:031A75008F952228 -:041A6D004393042279 -:041A71005393FB226E -:031A7800AF952205 -:031A7B00AF942203 +:041A860075938022B2 +:071A4C007593C043B10222B3 +:0C199100900083EBF0A3EAF0A3E9F02241 +:0C199D00900087EBF0A3EAF0A3E9F02231 +:0F18D100900097E04401F0E4900000F0021A8AC2 +:041A8A004393202240 +:0B19C100439310900097E054FEF022CA +:031A96008F952207 +:041A8E004393042258 +:041A92005393FB224D +:031A9900AF9522E4 +:031A9C00AF9422E2 :030043000207AA07 :1007AA00C0E0C0F0C083C082C0D075D008AF94EF5B :1007BA0012021F08F600080F08080F100817180879 @@ -358,61 +358,65 @@ :1007EA00085778086D80087F88086D90087F9808F8 :1007FA0086A008B2A808B2B008D9B80841C0084112 :10080A00C8000008F95393DF900098800812119BE2 -:10081A00500B12118CE0FF121A750208F91219AB6B +:10081A00500B12118CE0FF121A960208F91219C134 :10082A00900097E04440F00208F91211779000977F :10083A00E04402F00208F60208F1121177900086ED :10084A00E014FF90008AE0C39F502780229000970F :10085A00E04401F090008AE4F0900097E054FBF045 :10086A000208E712117790008AE0C3940850030245 -:10087A0008E70208EC900097E04404F0121A2B9063 +:10087A0008E70208EC900097E04404F0121A4C9042 :10088A0000831211A7601890008AE0FF7B017A00AA :10089A00798BC00A9000831211B3D00A12024990D0 :1008AA000097E054FEF080479000871211A7601A63 :1008BA007B017A007901C00A9000871211B3D00A2D :1008CA007F82120249900096EFF0900000E4F090C7 -:1008DA00000012118CE0F59512119B5005121A6D49 -:1008EA00800D121A718008121A2B80031219AB5349 +:1008DA00000012118CE0F59512119B5005121A8E28 +:1008EA00800D121A928008121A4C80031219C153F1 :0D08FA0093F7D0D0D082D083D0F0D0E03280 -:061A5400E4F514F5132275 -:071A3200C3E5139514FF2228 -:101744008F17C3E51395146480600FAF130513EF6F -:0A175400547F2422F8A6CFD517E831 -:01175E002268 +:0B19CC00AF130513EF547F2422F82214 +:061A7500E4F514F5132254 +:071A5300C3E5139514FF2207 +:101802008F17C3E5139514648060081219CCA6CF14 +:03181200D517EFF8 +:0118150022B0 +:101728008F17C3E5139514C3947F501085CF1812F3 +:0C17380019CCA6181219CCA618D517E67B +:011744002282 :0B1375009001AEEBF0A3EAF0A3E9F05A :10138000E4FFEFC39D5023AE140514EE547F2422D6 :10139000F8E6FE9001AEE0FBA3E0FAA3E0F98F824D :0A13A000758300EE1201940F80D84F :0113AA002220 -:061A5A00E4F516F515226B -:0F18CA00C3E5159516D394204003D38001C322A4 +:061A7B00E4F516F515224A +:0F18E000C3E5159516D394204003D38001C3228E :051300009001AEEDF0CC :10130500A3F0C3E51595166440602B9001AFE0FF8F :101315009001AEE0C39FFFE494008F82F583120134 :1013250055FFAE150515EE543F24A2F8A60790010A :06133500AFE014F070CCE3 :01133B00228F -:101728007F08E516B5150575CF80800DAE16051630 -:0B173800EE543F24A2F8E6F5CFDFE7F7 -:011743002283 +:101745007F08E516B5150575CF80800DAE16051613 +:0B175500EE543F24A2F8E6F5CFDFE7DA +:011760002266 :0215D700C10B46 -:0A19C000E4F512F511F510C20B2238 -:10170A00300B031219C0AE10051074572EF582E47F +:0A19E100E4F512F511F510C20B2217 +:10170A00300B031219E1AE10051074572EF582E45E :0E171A003401F583EFF0E510B43C02D20B224F -:10184800AF11051174572FF582E43401F583E0FFD9 -:01185800226D +:10185E00AF11051174572FF582E43401F583E0FFC3 +:01186E002257 :0215D900C10C43 -:10186A00E0FEA3E0FFE4FCFDFB7AFAF9F8D30201FB -:01187A00CCA1 +:10188000E0FEA3E0FFE4FCFDFB7AFAF9F8D30201E5 +:01189000CC8B :10154B00D291C281E49001ADF0A3F09001AD1218DD -:10155B006A40109001AEE004F070F09001ADE00431 +:10155B008040109001AEE004F070F09001ADE0041B :05156B00F080E8D281D0 :011570002258 :10157100C291C281E49001ACF0A3F09001AC1218C9 -:101581006A40109001ADE004F070F09001ACE0040D +:101581008040109001ADE004F070F09001ACE004F7 :05159100F080E8D281AA :011596002232 -:1018590020A304D20CD322300C0312154BC20CC3A3 -:01186900225C +:10186F0020A304D20CD322300C0312154BC20CC38D +:01187F002246 :0515DB004201CF0000F9 :1015970030090A7D207C017F007E01801520A30A87 :1015A7007D207C007F107E0080087D007C047F000A @@ -421,60 +425,60 @@ :10145500CFE0FAA3E0FBB50707EAB50603C2B3225E :10146500C3EB9DEA9C4009D2B3E49001CFF0A3F011 :011475002254 -:0D19020012013CF5CF740129F9E43AFA22F4 -:071A39008FC7AF058FD42217 +:0D19180012013CF5CF740129F9E43AFA22DE +:071A5A008FC7AF058FD422F6 :10133C0030F805E4F5C7802E30F90575C701802615 :10134C0030FA0575C702801E30FB0575C703801681 :10135C0030FC0575C704800E30FD0575C705800689 :09136C0030FE0375C706AFC7226D -:031A7E00AFE222B2 -:0919F000AFE3EFFEADE2EDFF22D2 -:10182500E4F5C7AF051DEF600512190280F543CE3B -:0218350010227F -:0C199300AF051DEF600512190280F5225F -:10187B00AF051DEF600AE5CF12018212190780F048 -:01188B00223A -:0919F9008FC7E4F5CE43CE202295 -:10188C007401A807088002C333D8FCF5D5E4F5D55C -:01189C002229 -:071A400075A41043A302226C -:071A4700121A4043BC80228B +:031A9F00AFE22291 +:091A1100AFE3EFFEADE2EDFF22B0 +:10183B00E4F5C7AF051DEF600512191880F543CE0F +:02184B00102269 +:0C19A900AF051DEF600512191880F52233 +:10189100AF051DEF600AE5CF12018212191D80F01C +:0118A1002224 +:091A1A008FC7E4F5CE43CE202273 +:1018A2007401A807088002C333D8FCF5D5E4F5D546 +:0118B2002213 +:071A610075A41043A302224B +:071A6800121A6143BC802249 :1014FA0041746D656C202852290A63353133312DC8 :10150A007573622D6364632D315F305F320A0A009E :09151A001B631B5B3F32356C00C2 :0B1245009001C9EBF0A3EAF0A3E9F070 :101250009001C9E0FBA3E475F0011201B6A9F0FA10 :1012600012013C9001CCF06013E0B40A057F0D122E -:101270001A139001CCE0FF121A1380D47F0D121ABA -:06128000137F0A021A139D -:091A02007BFF7A15791A021245E6 +:101270001A349001CCE0FF121A3480D47F0D121A78 +:06128000347F0A021A345B +:091A23007BFF7A15791A021245C5 :100D6D009001D2EDF09001D1EFF070097F0D121AC4 -:100D7D00137F0A80377F1B121A137F5B121A139091 +:100D7D00347F0A80377F1B121A347F5B121A34902E :100D8D0001D2E0FFD394094003120DCB9001D21292 -:100D9D000DBD7F3B121A139001D1E0FFD394094092 -:100DAD0003120DCB9001D1120DBD7F48121A1322E3 -:100DBD00E075F00A84E5F02430FF121A1322EF7566 -:0A0DCD00F00A842430FF121A1322EA -:051A6000A298920D2286 -:10177900759840538FF7438F0175CBFF75CAF37581 -:09178900C834D2CA439812D322DD -:081A13003099FDC2998F992260 -:071A1B003098FDAF99C2985D -:011A220022A1 -:0A19CA008FC5E5C430E7FB7F012262 -:0A19D40043A22012FFC053A2DF223D -:0C199F008F1CAF058F1F1219D4AF1D2242 -:10175F00A2AF920FC2AF8F1CAF038F1FAF058F1DAC -:09176F001219D4A20F92AF7F0100 -:01177800224E +:100D9D000DBD7F3B121A349001D1E0FFD394094071 +:100DAD0003120DCB9001D1120DBD7F48121A3422C2 +:100DBD00E075F00A84E5F02430FF121A3422EF7545 +:0A0DCD00F00A842430FF121A3422C9 +:051A8100A298920D2265 +:10177B00759840538FF7438F0175CBFF75CAF3757F +:09178B00C834D2CA439812D322DB +:081A34003099FDC2998F99223F +:071A3C003098FDAF99C2983C +:011A43002280 +:0A19EB008FC5E5C430E7FB7F012241 +:0A19F50043A22012FFC053A2DF221C +:0C19B5008F1CAF058F1F1219F5AF1D220B +:10176100A2AF920FC2AF8F1CAF038F1FAF058F1DAA +:091771001219F5A20F92AF7F01DD +:01177A00224C :081476009001D3EFF0A3EDF0AB -:10147E00A2AF920EC2AFE4FD7F0812199F9001D366 -:10148E00E0F45FFFA3E04FF51D751C071219D4A2FF +:10147E00A2AF920EC2AFE4FD7F081219B59001D350 +:10148E00E0F45FFFA3E04FF51D751C071219F5A2DE :05149E000E92AF7F017A :0114A3002226 -:081A2300C2AF43A22002F4004F +:081A4400C2AF43A22002F4002E :03000000020C608F -:0C0C6000787FE4F6D8FD7581E1020CA756 +:0C0C6000787FE4F6D8FD7581E5020CA752 :10004600E709F608DFFA8046E709F208DFFA803E9C :1000560088828C83E709F0A3DFFA8032E309F60889 :10006600DFFA8078E309F208DFFA807088828C83F1 @@ -514,7 +518,7 @@ :10022F0093F8740193F5828883E473740293686082 :06023F00EFA3A3A380DF82 :060245008A838982E47344 -:100C6C00021800E493A3F8E493A34003F68001F286 +:100C6C00021816E493A3F8E493A34003F68001F270 :100C7C0008DFF48029E493A3F85407240CC8C33389 :100C8C00C4540F4420C8834004F456800146F6DF58 :100C9C00E4800B01020408102040809015BDE47E16 |
From: jaguarondi <c2m...@c2...> - 2008-08-13 14:03:43
|
Author: jaguarondi Date: 2008-08-13 16:03:52 +0200 (Wed, 13 Aug 2008) New Revision: 1474 Modified: firmware/fuxusb/branches/new_rf/src/fifo_spk.c firmware/fuxusb/branches/new_rf/src/fifo_spk.h firmware/fuxusb/branches/new_rf/src/usb_ep.c Log: * Temporary patch to support 8kHz TTS. Modified: firmware/fuxusb/branches/new_rf/src/fifo_spk.c =================================================================== --- firmware/fuxusb/branches/new_rf/src/fifo_spk.c 2008-08-13 13:18:06 UTC (rev 1473) +++ firmware/fuxusb/branches/new_rf/src/fifo_spk.c 2008-08-13 14:03:52 UTC (rev 1474) @@ -89,6 +89,19 @@ } while (-- i); } +void FIFO_TTS_put_n (uint8_t const n) +{ + uint8_t data i = n, data d; + + do + { + if ((FifoIn_SPK_Idx - FifoOut_SPK_Idx) >= SPK_BUF_SIZE - 1) + return; + d = Usb_read_byte(); + Spk_buf[FifoIn_SPK_Idx++ & (SPK_BUF_SIZE - 1)] = d; + Spk_buf[FifoIn_SPK_Idx++ & (SPK_BUF_SIZE - 1)] = d; + } while (-- i); +} /** * \brief Pop one byte on the Speaker FIFO. * \return The popped byte. Modified: firmware/fuxusb/branches/new_rf/src/fifo_spk.h =================================================================== --- firmware/fuxusb/branches/new_rf/src/fifo_spk.h 2008-08-13 13:18:06 UTC (rev 1473) +++ firmware/fuxusb/branches/new_rf/src/fifo_spk.h 2008-08-13 14:03:52 UTC (rev 1474) @@ -32,6 +32,7 @@ extern void FIFO_SPK_init (void); extern uint8_t FIFO_SPK_length(void); extern void FIFO_SPK_put_n (uint8_t const n); +extern void FIFO_TTS_put_n (uint8_t const n); extern void FIFO_SPK_get_n (uint8_t *, uint8_t); #endif /* _FIFO_SPK_H_*/ Modified: firmware/fuxusb/branches/new_rf/src/usb_ep.c =================================================================== --- firmware/fuxusb/branches/new_rf/src/usb_ep.c 2008-08-13 13:18:06 UTC (rev 1473) +++ firmware/fuxusb/branches/new_rf/src/usb_ep.c 2008-08-13 14:03:52 UTC (rev 1474) @@ -174,7 +174,7 @@ { if(usb_get_nb_byte()) { - FIFO_SPK_put_n(8); + FIFO_TTS_put_n(8); } } Usb_clear_rx(); |
From: remi <c2m...@c2...> - 2008-08-13 13:17:57
|
Author: remi Date: 2008-08-13 15:18:06 +0200 (Wed, 13 Aug 2008) New Revision: 1473 Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties Log: * removed the duplicated i18n string entries Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 13:03:36 UTC (rev 1472) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 13:18:06 UTC (rev 1473) @@ -621,7 +621,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - ATTMessages.getString("AttitunePropertiesFrame.81")); //$NON-NLS-1$ + ATTMessages.getString("AttitunePropertiesFrame.80")); //$NON-NLS-1$ } } Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 13:03:36 UTC (rev 1472) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 13:18:06 UTC (rev 1473) @@ -132,7 +132,7 @@ frameLayout.setConstraints(statusBar, c); this.add(statusBar); - attBlockViewer.loadImages(ATTMessages.getString("MainFrame.30")); //$NON-NLS-1$ + attBlockViewer.loadImages("/"); //$NON-NLS-1$ attBlockViewer.events.register(ATTConfig.EVENT_POSITION_CHANGED, this, "onPositionChanged"); //$NON-NLS-1$ attBlockViewer.events.register(ATTConfig.EVENT_LENGTH_CHANGED, this, "onLengthChanged"); //$NON-NLS-1$ attBlockViewer.events.register(ATTConfig.EVENT_ZOOM_CHANGED, this, "onZoomChanged"); //$NON-NLS-1$ @@ -328,8 +328,8 @@ /* Save the changes first */ int result = JOptionPane.showConfirmDialog( this, - ATTMessages.getString("MainFrame.74"), //$NON-NLS-1$ - ATTMessages.getString("MainFrame.75"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.97"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.72"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -392,7 +392,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - ATTMessages.getString("MainFrame.79")); //$NON-NLS-1$ + ATTMessages.getString("MainFrame.78")); //$NON-NLS-1$ return; } /* Open a file viewer to select an attitune */ @@ -444,8 +444,8 @@ /* Save the changes first */ int result = JOptionPane.showConfirmDialog( this, - ATTMessages.getString("MainFrame.81"), //$NON-NLS-1$ - ATTMessages.getString("MainFrame.82"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.97"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.72"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -585,7 +585,7 @@ */ public void onBlockDragging(ATTBlock block, Double timeIdx) { - statusBar.setLabel3(ATTMessages.getString("MainFrame.88") + ATTMisc.timeToString(timeIdx)); //$NON-NLS-1$ + statusBar.setLabel3(ATTMessages.getString("MainFrame.87") + ATTMisc.timeToString(timeIdx)); //$NON-NLS-1$ } /* @@ -600,10 +600,10 @@ */ public void onAttituneLoaded(ATTBlockViewer bv) { - statusBar.setLabel1(ATTMessages.getString("MainFrame.89") + ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); //$NON-NLS-1$ - statusBar.setLabel2(ATTMessages.getString("MainFrame.90") + ATTMisc.timeToString(attBlockViewer.getLength())); //$NON-NLS-1$ + statusBar.setLabel1(ATTMessages.getString("MainFrame.85") + ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); //$NON-NLS-1$ + statusBar.setLabel2(ATTMessages.getString("MainFrame.86") + ATTMisc.timeToString(attBlockViewer.getLength())); //$NON-NLS-1$ statusBar.setLabel3(ATTMessages.getString("MainFrame.91")); //$NON-NLS-1$ - this.setTitle("Attitunes studio - " + attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$ + this.setTitle(ATTMessages.getString("MainFrame.0") + attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$ } /* Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties 2008-08-13 13:03:36 UTC (rev 1472) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties 2008-08-13 13:18:06 UTC (rev 1473) @@ -1,5 +1,4 @@ MainFrame.1=Attitunes studio -MainFrame.30=/ MainFrame.50=Create MainFrame.53=Delete MainFrame.56=Copy @@ -9,19 +8,11 @@ MainFrame.0=Attitunes studio - MainFrame.97=Save changes before to continue ? MainFrame.72=Scene have changed -MainFrame.74=Save changes before to continue ? -MainFrame.75=Scene have changed MainFrame.77=The attitune has been loaded MainFrame.78=You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties> -MainFrame.79=You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties> -MainFrame.81=Save changes before to continue ? -MainFrame.82=Scene have changed MainFrame.85=Position : MainFrame.86=Duration : MainFrame.87=Block start : -MainFrame.88=Block start : -MainFrame.89=Position : -MainFrame.90=Duration : MainFrame.91=Block start : 00:00:00 MainFrame.93=Your attitune has been saved MainFrame.95=You are sure that do you want deleting this block ? @@ -40,7 +31,6 @@ AttitunePropertiesFrame.67=Close AttitunePropertiesFrame.77=Enter your keyword : AttitunePropertiesFrame.80=Some parameters are missing. -AttitunePropertiesFrame.81=Some parameters are missing. AttituneMenuBar.12=File AttituneMenuBar.13=Edit AttituneMenuBar.14=Help |
From: remi <c2m...@c2...> - 2008-08-13 13:03:28
|
Author: remi Date: 2008-08-13 15:03:36 +0200 (Wed, 13 Aug 2008) New Revision: 1472 Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties Removed: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/Messages.java software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/messages.properties software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/Messages.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/messages.properties software_suite_v2/software/tools/attitunesStudio/trunk/src/messages.properties Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneMenuBar.java software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java Log: * centralized the I18n Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneMenuBar.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneMenuBar.java 2008-08-13 12:49:18 UTC (rev 1471) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneMenuBar.java 2008-08-13 13:03:36 UTC (rev 1472) @@ -3,6 +3,7 @@ import java.awt.event.*; import java.awt.*; import com.tuxisalive.api.*; +import com.tuxisalive.attitunes.*; /** * @@ -58,11 +59,11 @@ events.insert("onMenuItemOnline"); //$NON-NLS-1$ events.insert("onMenuItemAbout"); //$NON-NLS-1$ - menuFile = new Menu(Messages.getString("AttituneMenuBar.12")); //$NON-NLS-1$ - menuEdit = new Menu(Messages.getString("AttituneMenuBar.13")); //$NON-NLS-1$ - menuHelp = new Menu(Messages.getString("AttituneMenuBar.14")); //$NON-NLS-1$ + menuFile = new Menu(ATTMessages.getString("AttituneMenuBar.12")); //$NON-NLS-1$ + menuEdit = new Menu(ATTMessages.getString("AttituneMenuBar.13")); //$NON-NLS-1$ + menuHelp = new Menu(ATTMessages.getString("AttituneMenuBar.14")); //$NON-NLS-1$ - menuItemNew = new MenuItem(Messages.getString("AttituneMenuBar.15")); //$NON-NLS-1$ + menuItemNew = new MenuItem(ATTMessages.getString("AttituneMenuBar.15")); //$NON-NLS-1$ menuItemNew.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -70,7 +71,7 @@ } }); - menuItemLoad = new MenuItem(Messages.getString("AttituneMenuBar.17")); //$NON-NLS-1$ + menuItemLoad = new MenuItem(ATTMessages.getString("AttituneMenuBar.17")); //$NON-NLS-1$ menuItemLoad.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -78,7 +79,7 @@ } }); - menuItemSave = new MenuItem(Messages.getString("AttituneMenuBar.19")); //$NON-NLS-1$ + menuItemSave = new MenuItem(ATTMessages.getString("AttituneMenuBar.19")); //$NON-NLS-1$ menuItemSave.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -86,7 +87,7 @@ } }); - menuItemSaveAs = new MenuItem(Messages.getString("AttituneMenuBar.21")); //$NON-NLS-1$ + menuItemSaveAs = new MenuItem(ATTMessages.getString("AttituneMenuBar.21")); //$NON-NLS-1$ menuItemSaveAs.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -94,7 +95,7 @@ } }); - menuItemProperties = new MenuItem(Messages.getString("AttituneMenuBar.23")); //$NON-NLS-1$ + menuItemProperties = new MenuItem(ATTMessages.getString("AttituneMenuBar.23")); //$NON-NLS-1$ menuItemProperties.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -102,7 +103,7 @@ } }); - menuItemQuit = new MenuItem(Messages.getString("AttituneMenuBar.25")); //$NON-NLS-1$ + menuItemQuit = new MenuItem(ATTMessages.getString("AttituneMenuBar.25")); //$NON-NLS-1$ menuItemQuit.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -111,7 +112,7 @@ }); - menuItemCreate = new MenuItem(Messages.getString("AttituneMenuBar.27")); //$NON-NLS-1$ + menuItemCreate = new MenuItem(ATTMessages.getString("AttituneMenuBar.27")); //$NON-NLS-1$ menuItemCreate.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -119,7 +120,7 @@ } }); - menuItemDelete = new MenuItem(Messages.getString("AttituneMenuBar.29")); //$NON-NLS-1$ + menuItemDelete = new MenuItem(ATTMessages.getString("AttituneMenuBar.29")); //$NON-NLS-1$ menuItemDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -127,7 +128,7 @@ } }); - menuItemCopy = new MenuItem(Messages.getString("AttituneMenuBar.31")); //$NON-NLS-1$ + menuItemCopy = new MenuItem(ATTMessages.getString("AttituneMenuBar.31")); //$NON-NLS-1$ menuItemCopy.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -135,7 +136,7 @@ } }); - menuItemPast = new MenuItem(Messages.getString("AttituneMenuBar.33")); //$NON-NLS-1$ + menuItemPast = new MenuItem(ATTMessages.getString("AttituneMenuBar.33")); //$NON-NLS-1$ menuItemPast.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -144,7 +145,7 @@ }); - menuItemOnline = new MenuItem(Messages.getString("AttituneMenuBar.35")); //$NON-NLS-1$ + menuItemOnline = new MenuItem(ATTMessages.getString("AttituneMenuBar.35")); //$NON-NLS-1$ menuItemOnline.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -152,7 +153,7 @@ } }); - menuItemAbout = new MenuItem(Messages.getString("AttituneMenuBar.37")); //$NON-NLS-1$ + menuItemAbout = new MenuItem(ATTMessages.getString("AttituneMenuBar.37")); //$NON-NLS-1$ menuItemAbout.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 12:49:18 UTC (rev 1471) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 13:03:36 UTC (rev 1472) @@ -309,7 +309,7 @@ { jLabelNeedChamp = new JLabel(); jPanelNeededChamps.add(jLabelNeedChamp); - jLabelNeedChamp.setText(Messages.getString("AttitunePropertiesFrame.55")); //$NON-NLS-1$ + jLabelNeedChamp.setText(ATTMessages.getString("AttitunePropertiesFrame.55")); //$NON-NLS-1$ jLabelNeedChamp.setBackground(new java.awt.Color(255,128,128)); jLabelNeedChamp.setForeground(new java.awt.Color(255,0,0)); } @@ -332,37 +332,37 @@ BorderLayout jLabelPNameLayout = new BorderLayout(); jLabelPName.setLayout(jLabelPNameLayout); jPanelChamps.add(jLabelPName, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPName.setText(Messages.getString("AttitunePropertiesFrame.56")); //$NON-NLS-1$ + jLabelPName.setText(ATTMessages.getString("AttitunePropertiesFrame.56")); //$NON-NLS-1$ } { jLabelPAuthor = new JLabel(); jPanelChamps.add(jLabelPAuthor, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPAuthor.setText(Messages.getString("AttitunePropertiesFrame.57")); //$NON-NLS-1$ + jLabelPAuthor.setText(ATTMessages.getString("AttitunePropertiesFrame.57")); //$NON-NLS-1$ } { jLabelPDescription = new JLabel(); jPanelChamps.add(jLabelPDescription, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPDescription.setText(Messages.getString("AttitunePropertiesFrame.58")); //$NON-NLS-1$ + jLabelPDescription.setText(ATTMessages.getString("AttitunePropertiesFrame.58")); //$NON-NLS-1$ } { jLabelPVersion = new JLabel(); jPanelChamps.add(jLabelPVersion, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPVersion.setText(Messages.getString("AttitunePropertiesFrame.59")); //$NON-NLS-1$ + jLabelPVersion.setText(ATTMessages.getString("AttitunePropertiesFrame.59")); //$NON-NLS-1$ } { jLabelPCategory = new JLabel(); jPanelChamps.add(jLabelPCategory, new GridBagConstraints(1, 4, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPCategory.setText(Messages.getString("AttitunePropertiesFrame.60")); //$NON-NLS-1$ + jLabelPCategory.setText(ATTMessages.getString("AttitunePropertiesFrame.60")); //$NON-NLS-1$ } { jLabelPSubCategory = new JLabel(); jPanelChamps.add(jLabelPSubCategory, new GridBagConstraints(1, 5, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPSubCategory.setText(Messages.getString("AttitunePropertiesFrame.61")); //$NON-NLS-1$ + jLabelPSubCategory.setText(ATTMessages.getString("AttitunePropertiesFrame.61")); //$NON-NLS-1$ } { jLabelPKeywords = new JLabel(); jPanelChamps.add(jLabelPKeywords, new GridBagConstraints(1, 6, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPKeywords.setText(Messages.getString("AttitunePropertiesFrame.62")); //$NON-NLS-1$ + jLabelPKeywords.setText(ATTMessages.getString("AttitunePropertiesFrame.62")); //$NON-NLS-1$ } { jTextFieldName = new JTextField(); @@ -435,7 +435,7 @@ { jButtonAdd = new JButton(); jPanel1.add(jButtonAdd, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - jButtonAdd.setText(Messages.getString("AttitunePropertiesFrame.64")); //$NON-NLS-1$ + jButtonAdd.setText(ATTMessages.getString("AttitunePropertiesFrame.64")); //$NON-NLS-1$ jButtonAdd.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { jButtonAddMouseClicked(evt); @@ -445,7 +445,7 @@ { jButtonDelete = new JButton(); jPanel1.add(jButtonDelete, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - jButtonDelete.setText(Messages.getString("AttitunePropertiesFrame.65")); //$NON-NLS-1$ + jButtonDelete.setText(ATTMessages.getString("AttitunePropertiesFrame.65")); //$NON-NLS-1$ jButtonDelete.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { jButtonDeleteMouseClicked(evt); @@ -467,7 +467,7 @@ { jButtonValidate = new JButton(); jPanelValidate.add(jButtonValidate, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - jButtonValidate.setText(Messages.getString("AttitunePropertiesFrame.66")); //$NON-NLS-1$ + jButtonValidate.setText(ATTMessages.getString("AttitunePropertiesFrame.66")); //$NON-NLS-1$ jButtonValidate.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { jButtonValidateMouseClicked(evt); @@ -477,7 +477,7 @@ { jButtonClose = new JButton(); jPanelValidate.add(jButtonClose, new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - jButtonClose.setText(Messages.getString("AttitunePropertiesFrame.67")); //$NON-NLS-1$ + jButtonClose.setText(ATTMessages.getString("AttitunePropertiesFrame.67")); //$NON-NLS-1$ jButtonClose.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { jButtonCloseMouseClicked(evt); @@ -549,7 +549,7 @@ */ private void jButtonAddMouseClicked(MouseEvent evt) { - String keyword = JOptionPane.showInputDialog(Messages.getString("AttitunePropertiesFrame.77")); //$NON-NLS-1$ + String keyword = JOptionPane.showInputDialog(ATTMessages.getString("AttitunePropertiesFrame.77")); //$NON-NLS-1$ if (keyword == null) { @@ -592,7 +592,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - Messages.getString("AttitunePropertiesFrame.80")); //$NON-NLS-1$ + ATTMessages.getString("AttitunePropertiesFrame.80")); //$NON-NLS-1$ return; } } @@ -621,7 +621,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - Messages.getString("AttitunePropertiesFrame.81")); //$NON-NLS-1$ + ATTMessages.getString("AttitunePropertiesFrame.81")); //$NON-NLS-1$ } } Deleted: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/Messages.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/Messages.java 2008-08-13 12:49:18 UTC (rev 1471) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/Messages.java 2008-08-13 13:03:36 UTC (rev 1472) @@ -1,22 +0,0 @@ -package GUI; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class Messages { - private static final String BUNDLE_NAME = "GUI.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - private Messages() { - } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} Deleted: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/messages.properties =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/messages.properties 2008-08-13 12:49:18 UTC (rev 1471) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/messages.properties 2008-08-13 13:03:36 UTC (rev 1472) @@ -1,30 +0,0 @@ -AttitunePropertiesFrame.55=The parameters marked as red color are missing. -AttitunePropertiesFrame.56=Name : -AttitunePropertiesFrame.57=Author : -AttitunePropertiesFrame.58=Description : -AttitunePropertiesFrame.59=Version : -AttitunePropertiesFrame.60=Category : -AttitunePropertiesFrame.61=Sub category : -AttitunePropertiesFrame.62=Keywords : -AttitunePropertiesFrame.64=Add -AttitunePropertiesFrame.65=Delete -AttitunePropertiesFrame.66=Validate -AttitunePropertiesFrame.67=Close -AttitunePropertiesFrame.77=Enter your keyword : -AttitunePropertiesFrame.80=Some parameters are missing. -AttitunePropertiesFrame.81=Some parameters are missing. -AttituneMenuBar.12=File -AttituneMenuBar.13=Edit -AttituneMenuBar.14=Help -AttituneMenuBar.15=New -AttituneMenuBar.17=Load -AttituneMenuBar.19=Save -AttituneMenuBar.21=Save As... -AttituneMenuBar.23=Properties -AttituneMenuBar.25=Quit -AttituneMenuBar.27=Create -AttituneMenuBar.29=Delete -AttituneMenuBar.31=Copy -AttituneMenuBar.33=Past -AttituneMenuBar.35=Online -AttituneMenuBar.37=About Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java 2008-08-13 12:49:18 UTC (rev 1471) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java 2008-08-13 13:03:36 UTC (rev 1472) @@ -5,7 +5,7 @@ public class ATTMessages { - private static final String BUNDLE_NAME = "messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "com.tuxisalive.attitunes.messages"; //$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE; Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties (rev 0) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/messages.properties 2008-08-13 13:03:36 UTC (rev 1472) @@ -0,0 +1,64 @@ +MainFrame.1=Attitunes studio +MainFrame.30=/ +MainFrame.50=Create +MainFrame.53=Delete +MainFrame.56=Copy +MainFrame.59=Past +MainFrame.62=Play +MainFrame.65=Stop +MainFrame.0=Attitunes studio - +MainFrame.97=Save changes before to continue ? +MainFrame.72=Scene have changed +MainFrame.74=Save changes before to continue ? +MainFrame.75=Scene have changed +MainFrame.77=The attitune has been loaded +MainFrame.78=You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties> +MainFrame.79=You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties> +MainFrame.81=Save changes before to continue ? +MainFrame.82=Scene have changed +MainFrame.85=Position : +MainFrame.86=Duration : +MainFrame.87=Block start : +MainFrame.88=Block start : +MainFrame.89=Position : +MainFrame.90=Duration : +MainFrame.91=Block start : 00:00:00 +MainFrame.93=Your attitune has been saved +MainFrame.95=You are sure that do you want deleting this block ? +MainFrame.96=Block deleting +AttitunePropertiesFrame.55=The parameters marked as red color are missing. +AttitunePropertiesFrame.56=Name : +AttitunePropertiesFrame.57=Author : +AttitunePropertiesFrame.58=Description : +AttitunePropertiesFrame.59=Version : +AttitunePropertiesFrame.60=Category : +AttitunePropertiesFrame.61=Sub category : +AttitunePropertiesFrame.62=Keywords : +AttitunePropertiesFrame.64=Add +AttitunePropertiesFrame.65=Delete +AttitunePropertiesFrame.66=Validate +AttitunePropertiesFrame.67=Close +AttitunePropertiesFrame.77=Enter your keyword : +AttitunePropertiesFrame.80=Some parameters are missing. +AttitunePropertiesFrame.81=Some parameters are missing. +AttituneMenuBar.12=File +AttituneMenuBar.13=Edit +AttituneMenuBar.14=Help +AttituneMenuBar.15=New +AttituneMenuBar.17=Load +AttituneMenuBar.19=Save +AttituneMenuBar.21=Save As... +AttituneMenuBar.23=Properties +AttituneMenuBar.25=Quit +AttituneMenuBar.27=Create +AttituneMenuBar.29=Delete +AttituneMenuBar.31=Copy +AttituneMenuBar.33=Past +AttituneMenuBar.35=Online +AttituneMenuBar.37=About +ATTBlockViewer.7=Leds +ATTBlockViewer.9=Mouth\n& eyes +ATTBlockViewer.11=Wings +ATTBlockViewer.13=Spinning +ATTBlockViewer.15=Sound +ATTBlockViewer.17=TTS Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-13 12:49:18 UTC (rev 1471) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-13 13:03:36 UTC (rev 1472) @@ -13,8 +13,7 @@ import java.util.Hashtable; import com.tuxisalive.api.*; -import com.tuxisalive.attitunes.ATTConfig; -import com.tuxisalive.attitunes.ATTMisc; +import com.tuxisalive.attitunes.*; import com.tuxisalive.attitunes.block.ATTBlock; import com.tuxisalive.attitunes.block.ATTBlockContainer; import com.tuxisalive.attitunes.vector.ATTTlvVector; @@ -290,22 +289,22 @@ background = getToolkit().getImage(getClass().getResource(imgFileName)); imgFileName = path + "leds.png"; //$NON-NLS-1$ - blockContainer0.setLabel(Messages.getString("ATTBlockViewer.7"), imgFileName); //$NON-NLS-1$ + blockContainer0.setLabel(ATTMessages.getString("ATTBlockViewer.7"), imgFileName); //$NON-NLS-1$ imgFileName = path + "mouth+eyes.png"; //$NON-NLS-1$ - blockContainer1.setLabel(Messages.getString("ATTBlockViewer.9"), imgFileName); //$NON-NLS-1$ + blockContainer1.setLabel(ATTMessages.getString("ATTBlockViewer.9"), imgFileName); //$NON-NLS-1$ imgFileName = path + "wings.png"; //$NON-NLS-1$ - blockContainer2.setLabel(Messages.getString("ATTBlockViewer.11"), imgFileName); //$NON-NLS-1$ + blockContainer2.setLabel(ATTMessages.getString("ATTBlockViewer.11"), imgFileName); //$NON-NLS-1$ imgFileName = path + "spinning.png"; //$NON-NLS-1$ - blockContainer3.setLabel(Messages.getString("ATTBlockViewer.13"), imgFileName); //$NON-NLS-1$ + blockContainer3.setLabel(ATTMessages.getString("ATTBlockViewer.13"), imgFileName); //$NON-NLS-1$ imgFileName = path + "sound.png"; //$NON-NLS-1$ - blockContainer4.setLabel(Messages.getString("ATTBlockViewer.15"), imgFileName); //$NON-NLS-1$ + blockContainer4.setLabel(ATTMessages.getString("ATTBlockViewer.15"), imgFileName); //$NON-NLS-1$ imgFileName = path + "TTS.png"; //$NON-NLS-1$ - blockContainer5.setLabel(Messages.getString("ATTBlockViewer.17"), imgFileName); //$NON-NLS-1$ + blockContainer5.setLabel(ATTMessages.getString("ATTBlockViewer.17"), imgFileName); //$NON-NLS-1$ return true; } Deleted: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/Messages.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/Messages.java 2008-08-13 12:49:18 UTC (rev 1471) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/Messages.java 2008-08-13 13:03:36 UTC (rev 1472) @@ -1,22 +0,0 @@ -package com.tuxisalive.attitunes.visual; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class Messages { - private static final String BUNDLE_NAME = "com.tuxisalive.attitunes.visual.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - private Messages() { - } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} Deleted: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/messages.properties =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/messages.properties 2008-08-13 12:49:18 UTC (rev 1471) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/messages.properties 2008-08-13 13:03:36 UTC (rev 1472) @@ -1,6 +0,0 @@ -ATTBlockViewer.7=Leds -ATTBlockViewer.9=Mouth\n& eyes -ATTBlockViewer.11=Wings -ATTBlockViewer.13=Spinning -ATTBlockViewer.15=Sound -ATTBlockViewer.17=TTS Deleted: software_suite_v2/software/tools/attitunesStudio/trunk/src/messages.properties =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/messages.properties 2008-08-13 12:49:18 UTC (rev 1471) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/messages.properties 2008-08-13 13:03:36 UTC (rev 1472) @@ -1,28 +0,0 @@ -MainFrame.1=Attitunes studio -MainFrame.30=/ -MainFrame.50=Create -MainFrame.53=Delete -MainFrame.56=Copy -MainFrame.59=Past -MainFrame.62=Play -MainFrame.65=Stop -MainFrame.0=Attitunes studio - -MainFrame.97=Save changes before to continue ? -MainFrame.72=Scene have changed -MainFrame.74=Save changes before to continue ? -MainFrame.75=Scene have changed -MainFrame.77=The attitune has been loaded -MainFrame.78=You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties> -MainFrame.79=You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties> -MainFrame.81=Save changes before to continue ? -MainFrame.82=Scene have changed -MainFrame.85=Position : -MainFrame.86=Duration : -MainFrame.87=Block start : -MainFrame.88=Block start : -MainFrame.89=Position : -MainFrame.90=Duration : -MainFrame.91=Block start : 00:00:00 -MainFrame.93=Your attitune has been saved -MainFrame.95=You are sure that do you want deleting this block ? -MainFrame.96=Block deleting |
From: remi <c2m...@c2...> - 2008-08-13 12:49:11
|
Author: remi Date: 2008-08-13 14:49:18 +0200 (Wed, 13 Aug 2008) New Revision: 1471 Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java Removed: software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java Log: * updated i18n Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 12:32:30 UTC (rev 1470) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 12:49:18 UTC (rev 1471) @@ -69,7 +69,7 @@ { super(); initGUI(); - this.setTitle(Messages.getString("MainFrame.1")); //$NON-NLS-1$ + this.setTitle(ATTMessages.getString("MainFrame.1")); //$NON-NLS-1$ } /* @@ -132,7 +132,7 @@ frameLayout.setConstraints(statusBar, c); this.add(statusBar); - attBlockViewer.loadImages(Messages.getString("MainFrame.30")); //$NON-NLS-1$ + attBlockViewer.loadImages(ATTMessages.getString("MainFrame.30")); //$NON-NLS-1$ attBlockViewer.events.register(ATTConfig.EVENT_POSITION_CHANGED, this, "onPositionChanged"); //$NON-NLS-1$ attBlockViewer.events.register(ATTConfig.EVENT_LENGTH_CHANGED, this, "onLengthChanged"); //$NON-NLS-1$ attBlockViewer.events.register(ATTConfig.EVENT_ZOOM_CHANGED, this, "onZoomChanged"); //$NON-NLS-1$ @@ -181,7 +181,7 @@ attBlockViewer.add(zoomFullButton, new AnchorConstraint(580, 270)); /* Create button */ - createButton = new ATTSButton(Messages.getString("MainFrame.50"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + createButton = new ATTSButton(ATTMessages.getString("MainFrame.50"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ createButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$ createButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) @@ -192,7 +192,7 @@ attBlockViewer.add(createButton, new AnchorConstraint(110, 271)); /* Delete button */ - deleteButton = new ATTSButton(Messages.getString("MainFrame.53"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + deleteButton = new ATTSButton(ATTMessages.getString("MainFrame.53"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ deleteButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$ deleteButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) @@ -203,7 +203,7 @@ attBlockViewer.add(deleteButton, new AnchorConstraint(200, 271)); /* Copy button */ - copyButton = new ATTSButton(Messages.getString("MainFrame.56"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + copyButton = new ATTSButton(ATTMessages.getString("MainFrame.56"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ copyButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$ copyButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) @@ -214,7 +214,7 @@ attBlockViewer.add(copyButton, new AnchorConstraint(290, 271)); /* Past button */ - pastButton = new ATTSButton(Messages.getString("MainFrame.59"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + pastButton = new ATTSButton(ATTMessages.getString("MainFrame.59"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ pastButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$ pastButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) @@ -225,7 +225,7 @@ attBlockViewer.add(pastButton, new AnchorConstraint(380, 271)); /* Play button */ - playButton = new ATTSButton(Messages.getString("MainFrame.62"), Color.BLACK, "/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + playButton = new ATTSButton(ATTMessages.getString("MainFrame.62"), Color.BLACK, "/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ playButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); //$NON-NLS-1$ playButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) @@ -236,7 +236,7 @@ attBlockViewer.add(playButton, new AnchorConstraint(10, 248)); /* Stop button */ - stopButton = new ATTSButton(Messages.getString("MainFrame.65"), Color.BLACK, "/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + stopButton = new ATTSButton(ATTMessages.getString("MainFrame.65"), Color.BLACK, "/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ stopButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); //$NON-NLS-1$ stopButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) @@ -284,7 +284,7 @@ public void propertiesWindowClosed(WindowEvent evt) { System.out.println("The properties windows is closed !!"); //$NON-NLS-1$ - this.setTitle(Messages.getString("MainFrame.0") + attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$ + this.setTitle(ATTMessages.getString("MainFrame.0") + attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$ } /* ------------------------------------------------------------------------ @@ -302,8 +302,8 @@ /* Save the changes first */ int result = JOptionPane.showConfirmDialog( this, - Messages.getString("MainFrame.97"), //$NON-NLS-1$ - Messages.getString("MainFrame.72"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.97"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.72"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -328,8 +328,8 @@ /* Save the changes first */ int result = JOptionPane.showConfirmDialog( this, - Messages.getString("MainFrame.74"), //$NON-NLS-1$ - Messages.getString("MainFrame.75"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.74"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.75"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -351,7 +351,7 @@ if (attBlockViewer.loadAttitune(selFile.getPath())) { attBlockViewer.setAttituneIsTemplate(false); - JOptionPane.showMessageDialog(this, Messages.getString("MainFrame.77")); //$NON-NLS-1$ + JOptionPane.showMessageDialog(this, ATTMessages.getString("MainFrame.77")); //$NON-NLS-1$ } } } @@ -366,7 +366,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - Messages.getString("MainFrame.78")); //$NON-NLS-1$ + ATTMessages.getString("MainFrame.78")); //$NON-NLS-1$ confirmExit = false; return; } @@ -392,7 +392,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - Messages.getString("MainFrame.79")); //$NON-NLS-1$ + ATTMessages.getString("MainFrame.79")); //$NON-NLS-1$ return; } /* Open a file viewer to select an attitune */ @@ -444,8 +444,8 @@ /* Save the changes first */ int result = JOptionPane.showConfirmDialog( this, - Messages.getString("MainFrame.81"), //$NON-NLS-1$ - Messages.getString("MainFrame.82"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.81"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.82"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -519,7 +519,7 @@ */ public void onPositionChanged(Double newPosition) { - statusBar.setLabel1(Messages.getString("MainFrame.85") + ATTMisc.timeToString(newPosition)); //$NON-NLS-1$ + statusBar.setLabel1(ATTMessages.getString("MainFrame.85") + ATTMisc.timeToString(newPosition)); //$NON-NLS-1$ } /* @@ -527,7 +527,7 @@ */ public void onLengthChanged(Double newLength) { - statusBar.setLabel2(Messages.getString("MainFrame.86") + ATTMisc.timeToString(newLength)); //$NON-NLS-1$ + statusBar.setLabel2(ATTMessages.getString("MainFrame.86") + ATTMisc.timeToString(newLength)); //$NON-NLS-1$ } /* @@ -570,7 +570,7 @@ */ public void onBlockSelected(ATTBlock block) { - statusBar.setLabel3(Messages.getString("MainFrame.87") + ATTMisc.timeToString(block.getPosition())); //$NON-NLS-1$ + statusBar.setLabel3(ATTMessages.getString("MainFrame.87") + ATTMisc.timeToString(block.getPosition())); //$NON-NLS-1$ } /* @@ -585,7 +585,7 @@ */ public void onBlockDragging(ATTBlock block, Double timeIdx) { - statusBar.setLabel3(Messages.getString("MainFrame.88") + ATTMisc.timeToString(timeIdx)); //$NON-NLS-1$ + statusBar.setLabel3(ATTMessages.getString("MainFrame.88") + ATTMisc.timeToString(timeIdx)); //$NON-NLS-1$ } /* @@ -600,9 +600,9 @@ */ public void onAttituneLoaded(ATTBlockViewer bv) { - statusBar.setLabel1(Messages.getString("MainFrame.89") + ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); //$NON-NLS-1$ - statusBar.setLabel2(Messages.getString("MainFrame.90") + ATTMisc.timeToString(attBlockViewer.getLength())); //$NON-NLS-1$ - statusBar.setLabel3(Messages.getString("MainFrame.91")); //$NON-NLS-1$ + statusBar.setLabel1(ATTMessages.getString("MainFrame.89") + ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); //$NON-NLS-1$ + statusBar.setLabel2(ATTMessages.getString("MainFrame.90") + ATTMisc.timeToString(attBlockViewer.getLength())); //$NON-NLS-1$ + statusBar.setLabel3(ATTMessages.getString("MainFrame.91")); //$NON-NLS-1$ this.setTitle("Attitunes studio - " + attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$ } @@ -611,7 +611,7 @@ */ public void onAttituneSaved(ATTBlockViewer bv) { - JOptionPane.showMessageDialog(this, Messages.getString("MainFrame.93")); //$NON-NLS-1$ + JOptionPane.showMessageDialog(this, ATTMessages.getString("MainFrame.93")); //$NON-NLS-1$ } /* ------------------------------------------------------------------------ @@ -663,8 +663,8 @@ { int result = JOptionPane.showConfirmDialog( this, - Messages.getString("MainFrame.95"), //$NON-NLS-1$ - Messages.getString("MainFrame.96"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.95"), //$NON-NLS-1$ + ATTMessages.getString("MainFrame.96"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { Deleted: software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java 2008-08-13 12:32:30 UTC (rev 1470) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java 2008-08-13 12:49:18 UTC (rev 1471) @@ -1,20 +0,0 @@ -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class Messages { - private static final String BUNDLE_NAME = "messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - private Messages() { - } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java (rev 0) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/ATTMessages.java 2008-08-13 12:49:18 UTC (rev 1471) @@ -0,0 +1,28 @@ +package com.tuxisalive.attitunes; + +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +public class ATTMessages +{ + private static final String BUNDLE_NAME = "messages"; //$NON-NLS-1$ + + private static final ResourceBundle RESOURCE_BUNDLE; + + static + { + RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); + } + + public static String getString(String key) + { + try + { + return RESOURCE_BUNDLE.getString(key); + } + catch (MissingResourceException e) + { + return '!' + key + '!'; + } + } +} |
From: remi <c2m...@c2...> - 2008-08-13 12:32:22
|
Author: remi Date: 2008-08-13 14:32:30 +0200 (Wed, 13 Aug 2008) New Revision: 1470 Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/Messages.java software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/messages.properties software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/Messages.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/messages.properties software_suite_v2/software/tools/attitunesStudio/trunk/src/messages.properties Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneMenuBar.java software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java Log: * added bundled internationalization Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneMenuBar.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneMenuBar.java 2008-08-13 11:53:46 UTC (rev 1469) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneMenuBar.java 2008-08-13 12:32:30 UTC (rev 1470) @@ -45,118 +45,118 @@ super(); events = new TuxEventHandlers(); - events.insert("onMenuItemNew"); - events.insert("onMenuItemLoad"); - events.insert("onMenuItemSave"); - events.insert("onMenuItemSaveAs"); - events.insert("onMenuItemProperties"); - events.insert("onMenuItemQuit"); - events.insert("onMenuItemCreate"); - events.insert("onMenuItemDelete"); - events.insert("onMenuItemCopy"); - events.insert("onMenuItemPast"); - events.insert("onMenuItemOnline"); - events.insert("onMenuItemAbout"); + events.insert("onMenuItemNew"); //$NON-NLS-1$ + events.insert("onMenuItemLoad"); //$NON-NLS-1$ + events.insert("onMenuItemSave"); //$NON-NLS-1$ + events.insert("onMenuItemSaveAs"); //$NON-NLS-1$ + events.insert("onMenuItemProperties"); //$NON-NLS-1$ + events.insert("onMenuItemQuit"); //$NON-NLS-1$ + events.insert("onMenuItemCreate"); //$NON-NLS-1$ + events.insert("onMenuItemDelete"); //$NON-NLS-1$ + events.insert("onMenuItemCopy"); //$NON-NLS-1$ + events.insert("onMenuItemPast"); //$NON-NLS-1$ + events.insert("onMenuItemOnline"); //$NON-NLS-1$ + events.insert("onMenuItemAbout"); //$NON-NLS-1$ - menuFile = new Menu("File"); - menuEdit = new Menu("Edit"); - menuHelp = new Menu("Help"); + menuFile = new Menu(Messages.getString("AttituneMenuBar.12")); //$NON-NLS-1$ + menuEdit = new Menu(Messages.getString("AttituneMenuBar.13")); //$NON-NLS-1$ + menuHelp = new Menu(Messages.getString("AttituneMenuBar.14")); //$NON-NLS-1$ - menuItemNew = new MenuItem("New"); + menuItemNew = new MenuItem(Messages.getString("AttituneMenuBar.15")); //$NON-NLS-1$ menuItemNew.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemNew", menuItemNew); + events.notify("onMenuItemNew", menuItemNew); //$NON-NLS-1$ } }); - menuItemLoad = new MenuItem("Load"); + menuItemLoad = new MenuItem(Messages.getString("AttituneMenuBar.17")); //$NON-NLS-1$ menuItemLoad.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemLoad", menuItemLoad); + events.notify("onMenuItemLoad", menuItemLoad); //$NON-NLS-1$ } }); - menuItemSave = new MenuItem("Save"); + menuItemSave = new MenuItem(Messages.getString("AttituneMenuBar.19")); //$NON-NLS-1$ menuItemSave.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemSave", menuItemSave); + events.notify("onMenuItemSave", menuItemSave); //$NON-NLS-1$ } }); - menuItemSaveAs = new MenuItem("Save As..."); + menuItemSaveAs = new MenuItem(Messages.getString("AttituneMenuBar.21")); //$NON-NLS-1$ menuItemSaveAs.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemSaveAs", menuItemSaveAs); + events.notify("onMenuItemSaveAs", menuItemSaveAs); //$NON-NLS-1$ } }); - menuItemProperties = new MenuItem("Properties"); + menuItemProperties = new MenuItem(Messages.getString("AttituneMenuBar.23")); //$NON-NLS-1$ menuItemProperties.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemProperties", menuItemProperties); + events.notify("onMenuItemProperties", menuItemProperties); //$NON-NLS-1$ } }); - menuItemQuit = new MenuItem("Quit"); + menuItemQuit = new MenuItem(Messages.getString("AttituneMenuBar.25")); //$NON-NLS-1$ menuItemQuit.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemQuit", menuItemQuit); + events.notify("onMenuItemQuit", menuItemQuit); //$NON-NLS-1$ } }); - menuItemCreate = new MenuItem("Create"); + menuItemCreate = new MenuItem(Messages.getString("AttituneMenuBar.27")); //$NON-NLS-1$ menuItemCreate.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemCreate", menuItemCreate); + events.notify("onMenuItemCreate", menuItemCreate); //$NON-NLS-1$ } }); - menuItemDelete = new MenuItem("Delete"); + menuItemDelete = new MenuItem(Messages.getString("AttituneMenuBar.29")); //$NON-NLS-1$ menuItemDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemDelete", menuItemDelete); + events.notify("onMenuItemDelete", menuItemDelete); //$NON-NLS-1$ } }); - menuItemCopy = new MenuItem("Copy"); + menuItemCopy = new MenuItem(Messages.getString("AttituneMenuBar.31")); //$NON-NLS-1$ menuItemCopy.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemCopy", menuItemCopy); + events.notify("onMenuItemCopy", menuItemCopy); //$NON-NLS-1$ } }); - menuItemPast = new MenuItem("Past"); + menuItemPast = new MenuItem(Messages.getString("AttituneMenuBar.33")); //$NON-NLS-1$ menuItemPast.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemPast", menuItemPast); + events.notify("onMenuItemPast", menuItemPast); //$NON-NLS-1$ } }); - menuItemOnline = new MenuItem("Online"); + menuItemOnline = new MenuItem(Messages.getString("AttituneMenuBar.35")); //$NON-NLS-1$ menuItemOnline.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemOnline", menuItemOnline); + events.notify("onMenuItemOnline", menuItemOnline); //$NON-NLS-1$ } }); - menuItemAbout = new MenuItem("About"); + menuItemAbout = new MenuItem(Messages.getString("AttituneMenuBar.37")); //$NON-NLS-1$ menuItemAbout.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - events.notify("onMenuItemAbout", menuItemAbout); + events.notify("onMenuItemAbout", menuItemAbout); //$NON-NLS-1$ } }); Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 11:53:46 UTC (rev 1469) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 12:32:30 UTC (rev 1470) @@ -56,64 +56,64 @@ public class AttitunePropertiesFrame extends javax.swing.JFrame { private static String[] ATT_CATEGORIES = { - "Others", - "Alert", - "Fun", - "Education", - "Music", - "Messages", - "Kids", - "System" + "Others", //$NON-NLS-1$ + "Alert", //$NON-NLS-1$ + "Fun", //$NON-NLS-1$ + "Education", //$NON-NLS-1$ + "Music", //$NON-NLS-1$ + "Messages", //$NON-NLS-1$ + "Kids", //$NON-NLS-1$ + "System" //$NON-NLS-1$ }; private static String[] ATT_CATEGORY_OTHERS = { - "Others" + "Others" //$NON-NLS-1$ }; private static String[] ATT_CATEGORY_ALERT = { - "General", - "RSS", - "Mail" + "General", //$NON-NLS-1$ + "RSS", //$NON-NLS-1$ + "Mail" //$NON-NLS-1$ }; private static String[] ATT_CATEGORY_FUN = { - "General", - "Jokes", - "Sketches" + "General", //$NON-NLS-1$ + "Jokes", //$NON-NLS-1$ + "Sketches" //$NON-NLS-1$ }; private static String[] ATT_CATEGORY_EDUCATION = { - "General", - "Language", - "Computer", - "Sport" + "General", //$NON-NLS-1$ + "Language", //$NON-NLS-1$ + "Computer", //$NON-NLS-1$ + "Sport" //$NON-NLS-1$ }; private static String[] ATT_CATEGORY_MUSIC = { - "General", - "Dance", - "Top 50", - "Bulletin / Chronicle" + "General", //$NON-NLS-1$ + "Dance", //$NON-NLS-1$ + "Top 50", //$NON-NLS-1$ + "Bulletin / Chronicle" //$NON-NLS-1$ }; private static String[] ATT_CATEGORY_MESSAGES = { - "Birthday", - "St Valentine day", - "Congrats", - "Christmas" + "Birthday", //$NON-NLS-1$ + "St Valentine day", //$NON-NLS-1$ + "Congrats", //$NON-NLS-1$ + "Christmas" //$NON-NLS-1$ }; private static String[] ATT_CATEGORY_KIDS = { - "Stories", - "Games", - "Lullaby", - "Divers" + "Stories", //$NON-NLS-1$ + "Games", //$NON-NLS-1$ + "Lullaby", //$NON-NLS-1$ + "Divers" //$NON-NLS-1$ }; private static String[] ATT_CATEGORY_SYSTEM = { - "General", - "Battery", - "Lifeguard" + "General", //$NON-NLS-1$ + "Battery", //$NON-NLS-1$ + "Lifeguard" //$NON-NLS-1$ }; private static final long serialVersionUID = 1L; @@ -148,7 +148,7 @@ { //Set Look & Feel try { - javax.swing.UIManager.setLookAndFeel("com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); + javax.swing.UIManager.setLookAndFeel("com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); //$NON-NLS-1$ } catch(Exception e) { e.printStackTrace(); } @@ -177,7 +177,7 @@ /* Name */ jTextFieldName.setText(blockViewer.attituneFile.getHeaderName()); - if (badParams.contains("name")) + if (badParams.contains("name")) //$NON-NLS-1$ { jLabelPName.setForeground(Color.RED); } @@ -190,7 +190,7 @@ /* Description */ jTextAreaDescription.setText(blockViewer.attituneFile.getHeaderDescription()); - if (badParams.contains("description")) + if (badParams.contains("description")) //$NON-NLS-1$ { jLabelPDescription.setForeground(Color.RED); } @@ -211,7 +211,7 @@ } else { - jComboBoxCategory.setSelectedItem("Others"); + jComboBoxCategory.setSelectedItem("Others"); //$NON-NLS-1$ } /* Sub category */ @@ -223,7 +223,7 @@ } /* Keywords */ - String[] keywords = blockViewer.attituneFile.getHeaderKeywords().split(", "); + String[] keywords = blockViewer.attituneFile.getHeaderKeywords().split(", "); //$NON-NLS-1$ ListModel jListKeywordsModel = new DefaultComboBoxModel(keywords); jListKeywords.setModel(jListKeywordsModel); } @@ -239,9 +239,9 @@ blockViewer.attituneFile.setHeaderAuthor(jTextFieldAuthor.getText()); /* Set the description */ String description = jTextAreaDescription.getText(); - description = description.replace("<", ""); - description = description.replace(">", ""); - description = description.replace("//", ""); + description = description.replace("<", ""); //$NON-NLS-1$ //$NON-NLS-2$ + description = description.replace(">", ""); //$NON-NLS-1$ //$NON-NLS-2$ + description = description.replace("//", ""); //$NON-NLS-1$ //$NON-NLS-2$ blockViewer.attituneFile.setHeaderDescription(description); /* Set the version */ blockViewer.attituneFile.setHeaderVersion(jTextFieldVersion.getText()); @@ -250,14 +250,14 @@ /* Set the sub category */ blockViewer.attituneFile.setHeaderSubCategory((String)jComboBoxSubCategory.getSelectedItem()); /* Set the keywords */ - String keywords = ""; + String keywords = ""; //$NON-NLS-1$ for (int i = 0; i < jListKeywords.getModel().getSize(); i++) { keywords += (String)jListKeywords.getModel().getElementAt(i); if (i < jListKeywords.getModel().getSize() - 1) { - keywords += ", "; + keywords += ", "; //$NON-NLS-1$ } } blockViewer.attituneFile.setHeaderKeywords(keywords); @@ -270,14 +270,14 @@ */ private String[] getSubCategoryList(String category) { - if (category.equals("Others")) return ATT_CATEGORY_OTHERS; - else if (category.equals("Alert")) return ATT_CATEGORY_ALERT; - else if (category.equals("Fun")) return ATT_CATEGORY_FUN; - else if (category.equals("Education")) return ATT_CATEGORY_EDUCATION; - else if (category.equals("Music")) return ATT_CATEGORY_MUSIC; - else if (category.equals("Messages")) return ATT_CATEGORY_MESSAGES; - else if (category.equals("Kids")) return ATT_CATEGORY_KIDS; - else if (category.equals("System")) return ATT_CATEGORY_SYSTEM; + if (category.equals("Others")) return ATT_CATEGORY_OTHERS; //$NON-NLS-1$ + else if (category.equals("Alert")) return ATT_CATEGORY_ALERT; //$NON-NLS-1$ + else if (category.equals("Fun")) return ATT_CATEGORY_FUN; //$NON-NLS-1$ + else if (category.equals("Education")) return ATT_CATEGORY_EDUCATION; //$NON-NLS-1$ + else if (category.equals("Music")) return ATT_CATEGORY_MUSIC; //$NON-NLS-1$ + else if (category.equals("Messages")) return ATT_CATEGORY_MESSAGES; //$NON-NLS-1$ + else if (category.equals("Kids")) return ATT_CATEGORY_KIDS; //$NON-NLS-1$ + else if (category.equals("System")) return ATT_CATEGORY_SYSTEM; //$NON-NLS-1$ else return ATT_CATEGORY_OTHERS; } @@ -309,7 +309,7 @@ { jLabelNeedChamp = new JLabel(); jPanelNeededChamps.add(jLabelNeedChamp); - jLabelNeedChamp.setText("The parameters marked as red color are missing."); + jLabelNeedChamp.setText(Messages.getString("AttitunePropertiesFrame.55")); //$NON-NLS-1$ jLabelNeedChamp.setBackground(new java.awt.Color(255,128,128)); jLabelNeedChamp.setForeground(new java.awt.Color(255,0,0)); } @@ -332,37 +332,37 @@ BorderLayout jLabelPNameLayout = new BorderLayout(); jLabelPName.setLayout(jLabelPNameLayout); jPanelChamps.add(jLabelPName, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPName.setText("Name :"); + jLabelPName.setText(Messages.getString("AttitunePropertiesFrame.56")); //$NON-NLS-1$ } { jLabelPAuthor = new JLabel(); jPanelChamps.add(jLabelPAuthor, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPAuthor.setText("Author :"); + jLabelPAuthor.setText(Messages.getString("AttitunePropertiesFrame.57")); //$NON-NLS-1$ } { jLabelPDescription = new JLabel(); jPanelChamps.add(jLabelPDescription, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPDescription.setText("Description :"); + jLabelPDescription.setText(Messages.getString("AttitunePropertiesFrame.58")); //$NON-NLS-1$ } { jLabelPVersion = new JLabel(); jPanelChamps.add(jLabelPVersion, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPVersion.setText("Version :"); + jLabelPVersion.setText(Messages.getString("AttitunePropertiesFrame.59")); //$NON-NLS-1$ } { jLabelPCategory = new JLabel(); jPanelChamps.add(jLabelPCategory, new GridBagConstraints(1, 4, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPCategory.setText("Category :"); + jLabelPCategory.setText(Messages.getString("AttitunePropertiesFrame.60")); //$NON-NLS-1$ } { jLabelPSubCategory = new JLabel(); jPanelChamps.add(jLabelPSubCategory, new GridBagConstraints(1, 5, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPSubCategory.setText("Sub category :"); + jLabelPSubCategory.setText(Messages.getString("AttitunePropertiesFrame.61")); //$NON-NLS-1$ } { jLabelPKeywords = new JLabel(); jPanelChamps.add(jLabelPKeywords, new GridBagConstraints(1, 6, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - jLabelPKeywords.setText("Keywords :"); + jLabelPKeywords.setText(Messages.getString("AttitunePropertiesFrame.62")); //$NON-NLS-1$ } { jTextFieldName = new JTextField(); @@ -376,7 +376,7 @@ { jTextAreaDescription = new JTextArea(); jPanelChamps.add(jTextAreaDescription, new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); - jTextAreaDescription.setBorder(BorderFactory.createTitledBorder("")); + jTextAreaDescription.setBorder(BorderFactory.createTitledBorder("")); //$NON-NLS-1$ } { jTextFieldVersion = new JTextField(); @@ -435,7 +435,7 @@ { jButtonAdd = new JButton(); jPanel1.add(jButtonAdd, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - jButtonAdd.setText("Add"); + jButtonAdd.setText(Messages.getString("AttitunePropertiesFrame.64")); //$NON-NLS-1$ jButtonAdd.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { jButtonAddMouseClicked(evt); @@ -445,7 +445,7 @@ { jButtonDelete = new JButton(); jPanel1.add(jButtonDelete, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - jButtonDelete.setText("Delete"); + jButtonDelete.setText(Messages.getString("AttitunePropertiesFrame.65")); //$NON-NLS-1$ jButtonDelete.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { jButtonDeleteMouseClicked(evt); @@ -467,7 +467,7 @@ { jButtonValidate = new JButton(); jPanelValidate.add(jButtonValidate, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - jButtonValidate.setText("Validate"); + jButtonValidate.setText(Messages.getString("AttitunePropertiesFrame.66")); //$NON-NLS-1$ jButtonValidate.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { jButtonValidateMouseClicked(evt); @@ -477,7 +477,7 @@ { jButtonClose = new JButton(); jPanelValidate.add(jButtonClose, new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); - jButtonClose.setText("Close"); + jButtonClose.setText(Messages.getString("AttitunePropertiesFrame.67")); //$NON-NLS-1$ jButtonClose.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { jButtonCloseMouseClicked(evt); @@ -497,42 +497,42 @@ /* * On Category choosing */ - @SuppressWarnings("static-access") + @SuppressWarnings("static-access") //$NON-NLS-1$ private void jComboBoxCategoryItemStateChanged(ItemEvent evt) { ComboBoxModel jComboBoxCategoryModel; if (evt.getStateChange() == evt.SELECTED) { - if (evt.getItem().equals("Others")) + if (evt.getItem().equals("Others")) //$NON-NLS-1$ { jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_OTHERS); } - else if (evt.getItem().equals("Alert")) + else if (evt.getItem().equals("Alert")) //$NON-NLS-1$ { jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_ALERT); } - else if (evt.getItem().equals("Fun")) + else if (evt.getItem().equals("Fun")) //$NON-NLS-1$ { jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_FUN); } - else if (evt.getItem().equals("Education")) + else if (evt.getItem().equals("Education")) //$NON-NLS-1$ { jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_EDUCATION); } - else if (evt.getItem().equals("Music")) + else if (evt.getItem().equals("Music")) //$NON-NLS-1$ { jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_MUSIC); } - else if (evt.getItem().equals("Messages")) + else if (evt.getItem().equals("Messages")) //$NON-NLS-1$ { jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_MESSAGES); } - else if (evt.getItem().equals("Kids")) + else if (evt.getItem().equals("Kids")) //$NON-NLS-1$ { jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_KIDS); } - else if (evt.getItem().equals("System")) + else if (evt.getItem().equals("System")) //$NON-NLS-1$ { jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_SYSTEM); } @@ -549,14 +549,14 @@ */ private void jButtonAddMouseClicked(MouseEvent evt) { - String keyword = JOptionPane.showInputDialog("Enter your keyword :"); + String keyword = JOptionPane.showInputDialog(Messages.getString("AttitunePropertiesFrame.77")); //$NON-NLS-1$ if (keyword == null) { return; } - if (!keyword.equals("")) + if (!keyword.equals("")) //$NON-NLS-1$ { ((DefaultComboBoxModel)jListKeywords.getModel()).addElement(keyword); } @@ -574,7 +574,7 @@ return; } - if (!selected.equals("")) + if (!selected.equals("")) //$NON-NLS-1$ { ((DefaultComboBoxModel)jListKeywords.getModel()).removeElement(selected); } @@ -592,7 +592,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - "Some parameters are missing."); + Messages.getString("AttitunePropertiesFrame.80")); //$NON-NLS-1$ return; } } @@ -621,7 +621,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - "Some parameters are missing."); + Messages.getString("AttitunePropertiesFrame.81")); //$NON-NLS-1$ } } Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/Messages.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/Messages.java (rev 0) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/Messages.java 2008-08-13 12:32:30 UTC (rev 1470) @@ -0,0 +1,22 @@ +package GUI; + +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +public class Messages { + private static final String BUNDLE_NAME = "GUI.messages"; //$NON-NLS-1$ + + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle + .getBundle(BUNDLE_NAME); + + private Messages() { + } + + public static String getString(String key) { + try { + return RESOURCE_BUNDLE.getString(key); + } catch (MissingResourceException e) { + return '!' + key + '!'; + } + } +} Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/messages.properties =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/messages.properties (rev 0) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/messages.properties 2008-08-13 12:32:30 UTC (rev 1470) @@ -0,0 +1,30 @@ +AttitunePropertiesFrame.55=The parameters marked as red color are missing. +AttitunePropertiesFrame.56=Name : +AttitunePropertiesFrame.57=Author : +AttitunePropertiesFrame.58=Description : +AttitunePropertiesFrame.59=Version : +AttitunePropertiesFrame.60=Category : +AttitunePropertiesFrame.61=Sub category : +AttitunePropertiesFrame.62=Keywords : +AttitunePropertiesFrame.64=Add +AttitunePropertiesFrame.65=Delete +AttitunePropertiesFrame.66=Validate +AttitunePropertiesFrame.67=Close +AttitunePropertiesFrame.77=Enter your keyword : +AttitunePropertiesFrame.80=Some parameters are missing. +AttitunePropertiesFrame.81=Some parameters are missing. +AttituneMenuBar.12=File +AttituneMenuBar.13=Edit +AttituneMenuBar.14=Help +AttituneMenuBar.15=New +AttituneMenuBar.17=Load +AttituneMenuBar.19=Save +AttituneMenuBar.21=Save As... +AttituneMenuBar.23=Properties +AttituneMenuBar.25=Quit +AttituneMenuBar.27=Create +AttituneMenuBar.29=Delete +AttituneMenuBar.31=Copy +AttituneMenuBar.33=Past +AttituneMenuBar.35=Online +AttituneMenuBar.37=About Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 11:53:46 UTC (rev 1469) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 12:32:30 UTC (rev 1470) @@ -56,7 +56,7 @@ { //Set Look & Feel try { - javax.swing.UIManager.setLookAndFeel("com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); + javax.swing.UIManager.setLookAndFeel("com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); //$NON-NLS-1$ } catch(Exception e) { e.printStackTrace(); } @@ -69,7 +69,7 @@ { super(); initGUI(); - this.setTitle("Attitunes studio"); + this.setTitle(Messages.getString("MainFrame.1")); //$NON-NLS-1$ } /* @@ -82,18 +82,18 @@ /* Create the menu bar */ menuBar = new AttituneMenuBar(); this.setMenuBar(menuBar); - menuBar.events.register("onMenuItemNew", this, "onMenuItemNew"); - menuBar.events.register("onMenuItemLoad", this, "onMenuItemLoad"); - menuBar.events.register("onMenuItemSave", this, "onMenuItemSave"); - menuBar.events.register("onMenuItemSaveAs", this, "onMenuItemSaveAs"); - menuBar.events.register("onMenuItemProperties", this, "onMenuItemProperties"); - menuBar.events.register("onMenuItemQuit", this, "onMenuItemQuit"); - menuBar.events.register("onMenuItemCreate", this, "onMenuItemCreate"); - menuBar.events.register("onMenuItemDelete", this, "onMenuItemDelete"); - menuBar.events.register("onMenuItemCopy", this, "onMenuItemCopy"); - menuBar.events.register("onMenuItemPast", this, "onMenuItemPast"); - menuBar.events.register("onMenuItemOnline", this, "onMenuItemOnline"); - menuBar.events.register("onMenuItemAbout", this, "onMenuItemAbout"); + menuBar.events.register("onMenuItemNew", this, "onMenuItemNew"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemLoad", this, "onMenuItemLoad"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemSave", this, "onMenuItemSave"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemSaveAs", this, "onMenuItemSaveAs"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemProperties", this, "onMenuItemProperties"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemQuit", this, "onMenuItemQuit"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemCreate", this, "onMenuItemCreate"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemDelete", this, "onMenuItemDelete"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemCopy", this, "onMenuItemCopy"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemPast", this, "onMenuItemPast"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemOnline", this, "onMenuItemOnline"); //$NON-NLS-1$ //$NON-NLS-2$ + menuBar.events.register("onMenuItemAbout", this, "onMenuItemAbout"); //$NON-NLS-1$ //$NON-NLS-2$ /* Add a layout to the frame */ frameLayout = new GridBagLayout(); @@ -122,34 +122,34 @@ frameLayout.setConstraints(attBlockViewer, c); this.add(attBlockViewer); - Button test = new Button("Hello"); + Button test = new Button("Hello"); //$NON-NLS-1$ test.setPreferredSize(new java.awt.Dimension(640, 200)); frameLayout.setConstraints(test, c); this.add(test); /* Status bar */ - statusBar = new AttituneStatusBar("Hello", "world", "coucou"); + statusBar = new AttituneStatusBar("Hello", "world", "coucou"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ frameLayout.setConstraints(statusBar, c); this.add(statusBar); - attBlockViewer.loadImages("/"); - attBlockViewer.events.register(ATTConfig.EVENT_POSITION_CHANGED, this, "onPositionChanged"); - attBlockViewer.events.register(ATTConfig.EVENT_LENGTH_CHANGED, this, "onLengthChanged"); - attBlockViewer.events.register(ATTConfig.EVENT_ZOOM_CHANGED, this, "onZoomChanged"); - attBlockViewer.events.register(ATTConfig.EVENT_SCROLLBAR_DRAG_STARTED, this, "onScrollbarDragStarted"); - attBlockViewer.events.register(ATTConfig.EVENT_SCROLLBAR_DRAGGING, this, "onScrollbarDragging"); - attBlockViewer.events.register(ATTConfig.EVENT_SCROLLBAR_DRAG_STOPPED, this, "onScrollbarDragStopped"); - attBlockViewer.events.register(ATTConfig.EVENT_ROW_SELECTED, this, "onRowSelected"); - attBlockViewer.events.register(ATTConfig.EVENT_BLOCK_SELECTED, this, "onBlockSelected"); - attBlockViewer.events.register(ATTConfig.EVENT_BLOCK_DRAG_STARTED, this, "onBlockDragStarted"); - attBlockViewer.events.register(ATTConfig.EVENT_BLOCK_DRAGGING, this, "onBlockDragging"); - attBlockViewer.events.register(ATTConfig.EVENT_BLOCK_DRAG_STOPPED, this, "onBlockDragStopped"); - attBlockViewer.events.register(ATTConfig.EVENT_ATTITUNE_LOADED, this, "onAttituneLoaded"); - attBlockViewer.events.register(ATTConfig.EVENT_ATTITUNE_SAVED, this, "onAttituneSaved"); + attBlockViewer.loadImages(Messages.getString("MainFrame.30")); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_POSITION_CHANGED, this, "onPositionChanged"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_LENGTH_CHANGED, this, "onLengthChanged"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_ZOOM_CHANGED, this, "onZoomChanged"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_SCROLLBAR_DRAG_STARTED, this, "onScrollbarDragStarted"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_SCROLLBAR_DRAGGING, this, "onScrollbarDragging"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_SCROLLBAR_DRAG_STOPPED, this, "onScrollbarDragStopped"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_ROW_SELECTED, this, "onRowSelected"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_BLOCK_SELECTED, this, "onBlockSelected"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_BLOCK_DRAG_STARTED, this, "onBlockDragStarted"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_BLOCK_DRAGGING, this, "onBlockDragging"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_BLOCK_DRAG_STOPPED, this, "onBlockDragStopped"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_ATTITUNE_LOADED, this, "onAttituneLoaded"); //$NON-NLS-1$ + attBlockViewer.events.register(ATTConfig.EVENT_ATTITUNE_SAVED, this, "onAttituneSaved"); //$NON-NLS-1$ /* Zoom plus button */ - zoomPlusButton = new ATTSButton("/zoomPlusButton.png"); - zoomPlusButton.setPressedIcon(new ImageIcon(getClass().getResource("/zoomPressedButton.png"))); + zoomPlusButton = new ATTSButton("/zoomPlusButton.png"); //$NON-NLS-1$ + zoomPlusButton.setPressedIcon(new ImageIcon(getClass().getResource("/zoomPressedButton.png"))); //$NON-NLS-1$ zoomPlusButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -159,8 +159,8 @@ attBlockViewer.add(zoomPlusButton, new AnchorConstraint(520, 270)); /* Zoom minus button */ - zoomMinusButton = new ATTSButton("/zoomMinusButton.png"); - zoomMinusButton.setPressedIcon(new ImageIcon(getClass().getResource("/zoomPressedButton.png"))); + zoomMinusButton = new ATTSButton("/zoomMinusButton.png"); //$NON-NLS-1$ + zoomMinusButton.setPressedIcon(new ImageIcon(getClass().getResource("/zoomPressedButton.png"))); //$NON-NLS-1$ zoomMinusButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -170,8 +170,8 @@ attBlockViewer.add(zoomMinusButton, new AnchorConstraint(550, 270)); /* Zoom full button */ - zoomFullButton = new ATTSButton("/zoomFullButton.png"); - zoomFullButton.setPressedIcon(new ImageIcon(getClass().getResource("/zoomPressedButton.png"))); + zoomFullButton = new ATTSButton("/zoomFullButton.png"); //$NON-NLS-1$ + zoomFullButton.setPressedIcon(new ImageIcon(getClass().getResource("/zoomPressedButton.png"))); //$NON-NLS-1$ zoomFullButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -181,8 +181,8 @@ attBlockViewer.add(zoomFullButton, new AnchorConstraint(580, 270)); /* Create button */ - createButton = new ATTSButton("Create", Color.WHITE, "/actionButton1Enable.png"); - createButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); + createButton = new ATTSButton(Messages.getString("MainFrame.50"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + createButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$ createButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -192,8 +192,8 @@ attBlockViewer.add(createButton, new AnchorConstraint(110, 271)); /* Delete button */ - deleteButton = new ATTSButton("Delete", Color.WHITE, "/actionButton1Enable.png"); - deleteButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); + deleteButton = new ATTSButton(Messages.getString("MainFrame.53"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + deleteButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$ deleteButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -203,8 +203,8 @@ attBlockViewer.add(deleteButton, new AnchorConstraint(200, 271)); /* Copy button */ - copyButton = new ATTSButton("Copy", Color.WHITE, "/actionButton1Enable.png"); - copyButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); + copyButton = new ATTSButton(Messages.getString("MainFrame.56"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + copyButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$ copyButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -214,8 +214,8 @@ attBlockViewer.add(copyButton, new AnchorConstraint(290, 271)); /* Past button */ - pastButton = new ATTSButton("Past", Color.WHITE, "/actionButton1Enable.png"); - pastButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); + pastButton = new ATTSButton(Messages.getString("MainFrame.59"), Color.WHITE, "/actionButton1Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + pastButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton1Pressed.png"))); //$NON-NLS-1$ pastButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -225,8 +225,8 @@ attBlockViewer.add(pastButton, new AnchorConstraint(380, 271)); /* Play button */ - playButton = new ATTSButton("Play", Color.BLACK, "/actionButton2Enable.png"); - playButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); + playButton = new ATTSButton(Messages.getString("MainFrame.62"), Color.BLACK, "/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + playButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); //$NON-NLS-1$ playButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -236,8 +236,8 @@ attBlockViewer.add(playButton, new AnchorConstraint(10, 248)); /* Stop button */ - stopButton = new ATTSButton("Stop", Color.BLACK, "/actionButton2Enable.png"); - stopButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); + stopButton = new ATTSButton(Messages.getString("MainFrame.65"), Color.BLACK, "/actionButton2Enable.png"); //$NON-NLS-1$ //$NON-NLS-2$ + stopButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); //$NON-NLS-1$ stopButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -257,7 +257,7 @@ setSize(648, 400); /* Load the template file */ - attBlockViewer.loadAttitune("C:/tuxdroid/resources/templates/template.att"); + attBlockViewer.loadAttitune("C:/tuxdroid/resources/templates/template.att"); //$NON-NLS-1$ attBlockViewer.setAttituneIsTemplate(true); } catch (Exception e) @@ -283,8 +283,8 @@ */ public void propertiesWindowClosed(WindowEvent evt) { - System.out.println("The properties windows is closed !!"); - this.setTitle("Attitunes studio - " + attBlockViewer.attituneFile.getHeaderName()); + System.out.println("The properties windows is closed !!"); //$NON-NLS-1$ + this.setTitle(Messages.getString("MainFrame.0") + attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$ } /* ------------------------------------------------------------------------ @@ -302,8 +302,8 @@ /* Save the changes first */ int result = JOptionPane.showConfirmDialog( this, - "Save changes before to continue ?", - "Scene have changed", + Messages.getString("MainFrame.97"), //$NON-NLS-1$ + Messages.getString("MainFrame.72"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -311,7 +311,7 @@ } } /* Load the template */ - if (attBlockViewer.loadAttitune("C:/tuxdroid/resources/templates/template.att")) + if (attBlockViewer.loadAttitune("C:/tuxdroid/resources/templates/template.att")) //$NON-NLS-1$ { attBlockViewer.setAttituneIsTemplate(true); } @@ -328,8 +328,8 @@ /* Save the changes first */ int result = JOptionPane.showConfirmDialog( this, - "Save changes before to continue ?", - "Scene have changed", + Messages.getString("MainFrame.74"), //$NON-NLS-1$ + Messages.getString("MainFrame.75"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -346,12 +346,12 @@ { return; } - if (selFile.getPath().endsWith(".att")) + if (selFile.getPath().endsWith(".att")) //$NON-NLS-1$ { if (attBlockViewer.loadAttitune(selFile.getPath())) { attBlockViewer.setAttituneIsTemplate(false); - JOptionPane.showMessageDialog(this, "The attitune has been loaded"); + JOptionPane.showMessageDialog(this, Messages.getString("MainFrame.77")); //$NON-NLS-1$ } } } @@ -366,7 +366,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - "You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties>"); + Messages.getString("MainFrame.78")); //$NON-NLS-1$ confirmExit = false; return; } @@ -392,7 +392,7 @@ if (badParams.size() > 0) { JOptionPane.showMessageDialog(this, - "You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties>"); + Messages.getString("MainFrame.79")); //$NON-NLS-1$ return; } /* Open a file viewer to select an attitune */ @@ -408,7 +408,7 @@ System.out.println(attBlockViewer.checkHeader()); - if (selFile.getPath().endsWith(".att")) + if (selFile.getPath().endsWith(".att")) //$NON-NLS-1$ { if (attBlockViewer.saveAttitune(selFile.getPath())) { @@ -444,8 +444,8 @@ /* Save the changes first */ int result = JOptionPane.showConfirmDialog( this, - "Save changes before to continue ?", - "Scene have changed", + Messages.getString("MainFrame.81"), //$NON-NLS-1$ + Messages.getString("MainFrame.82"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { @@ -499,7 +499,7 @@ */ public void onMenuItemOnline(MenuItem menuItem) { - System.out.println("Online"); + System.out.println("Online"); //$NON-NLS-1$ } /* @@ -507,7 +507,7 @@ */ public void onMenuItemAbout(MenuItem menuItem) { - System.out.println("About"); + System.out.println("About"); //$NON-NLS-1$ } /* ------------------------------------------------------------------------ @@ -519,7 +519,7 @@ */ public void onPositionChanged(Double newPosition) { - statusBar.setLabel1("Position : " + ATTMisc.timeToString(newPosition)); + statusBar.setLabel1(Messages.getString("MainFrame.85") + ATTMisc.timeToString(newPosition)); //$NON-NLS-1$ } /* @@ -527,7 +527,7 @@ */ public void onLengthChanged(Double newLength) { - statusBar.setLabel2("Duration : " + ATTMisc.timeToString(newLength)); + statusBar.setLabel2(Messages.getString("MainFrame.86") + ATTMisc.timeToString(newLength)); //$NON-NLS-1$ } /* @@ -570,7 +570,7 @@ */ public void onBlockSelected(ATTBlock block) { - statusBar.setLabel3("Block start : " + ATTMisc.timeToString(block.getPosition())); + statusBar.setLabel3(Messages.getString("MainFrame.87") + ATTMisc.timeToString(block.getPosition())); //$NON-NLS-1$ } /* @@ -585,7 +585,7 @@ */ public void onBlockDragging(ATTBlock block, Double timeIdx) { - statusBar.setLabel3("Block start : " + ATTMisc.timeToString(timeIdx)); + statusBar.setLabel3(Messages.getString("MainFrame.88") + ATTMisc.timeToString(timeIdx)); //$NON-NLS-1$ } /* @@ -600,10 +600,10 @@ */ public void onAttituneLoaded(ATTBlockViewer bv) { - statusBar.setLabel1("Position : " + ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); - statusBar.setLabel2("Duration : " + ATTMisc.timeToString(attBlockViewer.getLength())); - statusBar.setLabel3("Block start : 00:00:00"); - this.setTitle("Attitunes studio - " + attBlockViewer.attituneFile.getHeaderName()); + statusBar.setLabel1(Messages.getString("MainFrame.89") + ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); //$NON-NLS-1$ + statusBar.setLabel2(Messages.getString("MainFrame.90") + ATTMisc.timeToString(attBlockViewer.getLength())); //$NON-NLS-1$ + statusBar.setLabel3(Messages.getString("MainFrame.91")); //$NON-NLS-1$ + this.setTitle("Attitunes studio - " + attBlockViewer.attituneFile.getHeaderName()); //$NON-NLS-1$ } /* @@ -611,7 +611,7 @@ */ public void onAttituneSaved(ATTBlockViewer bv) { - JOptionPane.showMessageDialog(this, "Your attitune has been saved"); + JOptionPane.showMessageDialog(this, Messages.getString("MainFrame.93")); //$NON-NLS-1$ } /* ------------------------------------------------------------------------ @@ -653,7 +653,7 @@ attBlockViewer.getFocusedRow(), params, attBlockViewer.getCurrentPosition(), - (Double)params.get("duration")); + (Double)params.get("duration")); //$NON-NLS-1$ } /* @@ -663,8 +663,8 @@ { int result = JOptionPane.showConfirmDialog( this, - "You are sure that do you want deleting this block ?", - "Block deleting", + Messages.getString("MainFrame.95"), //$NON-NLS-1$ + Messages.getString("MainFrame.96"), //$NON-NLS-1$ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java (rev 0) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/Messages.java 2008-08-13 12:32:30 UTC (rev 1470) @@ -0,0 +1,20 @@ +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +public class Messages { + private static final String BUNDLE_NAME = "messages"; //$NON-NLS-1$ + + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle + .getBundle(BUNDLE_NAME); + + private Messages() { + } + + public static String getString(String key) { + try { + return RESOURCE_BUNDLE.getString(key); + } catch (MissingResourceException e) { + return '!' + key + '!'; + } + } +} Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-13 11:53:46 UTC (rev 1469) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-13 12:32:30 UTC (rev 1470) @@ -84,7 +84,7 @@ public ATTFormatReadWrite attituneFile; - public TuxAPI tux = new TuxAPI("localhost", 270); + public TuxAPI tux = new TuxAPI("localhost", 270); //$NON-NLS-1$ private boolean sceneHaveChanged = false; @@ -128,7 +128,7 @@ /* Timeline rule */ rulesTable = new ArrayList<Double>(); majorRuleRes = 1; - ruleFont = new Font("SansSerif", Font.PLAIN, 10); + ruleFont = new Font("SansSerif", Font.PLAIN, 10); //$NON-NLS-1$ /* Viewer areas colors */ blockViewerFillColor = new Color(ATTConfig.BLOCK_VIEWER_FILL_COLOR[0], ATTConfig.BLOCK_VIEWER_FILL_COLOR[1], @@ -178,7 +178,7 @@ refreshDelay = 0.2; refreshFlag = false; refreshStarted = false; - refreshThread = new SThread(this, "refreshLoop"); + refreshThread = new SThread(this, "refreshLoop"); //$NON-NLS-1$ refreshThread.start(); /* Update the coordinates */ @@ -187,7 +187,7 @@ /* Set visible */ this.setVisible(true); /* Connect the tuxdroid api */ - tux.server.autoConnect(TuxAPIConst.CLIENT_LEVEL_RESTRICTED, "AttitunesStudio", "attscene"); + tux.server.autoConnect(TuxAPIConst.CLIENT_LEVEL_RESTRICTED, "AttitunesStudio", "attscene"); //$NON-NLS-1$ //$NON-NLS-2$ /* Refresh the viewer */ this.setZoomFactor(1); } @@ -286,26 +286,26 @@ { String imgFileName; - imgFileName = path + "background.png"; + imgFileName = path + "background.png"; //$NON-NLS-1$ background = getToolkit().getImage(getClass().getResource(imgFileName)); - imgFileName = path + "leds.png"; - blockContainer0.setLabel("Leds", imgFileName); + imgFileName = path + "leds.png"; //$NON-NLS-1$ + blockContainer0.setLabel(Messages.getString("ATTBlockViewer.7"), imgFileName); //$NON-NLS-1$ - imgFileName = path + "mouth+eyes.png"; - blockContainer1.setLabel("Mouth\n& eyes", imgFileName); + imgFileName = path + "mouth+eyes.png"; //$NON-NLS-1$ + blockContainer1.setLabel(Messages.getString("ATTBlockViewer.9"), imgFileName); //$NON-NLS-1$ - imgFileName = path + "wings.png"; - blockContainer2.setLabel("Wings", imgFileName); + imgFileName = path + "wings.png"; //$NON-NLS-1$ + blockContainer2.setLabel(Messages.getString("ATTBlockViewer.11"), imgFileName); //$NON-NLS-1$ - imgFileName = path + "spinning.png"; - blockContainer3.setLabel("Spinning", imgFileName); + imgFileName = path + "spinning.png"; //$NON-NLS-1$ + blockContainer3.setLabel(Messages.getString("ATTBlockViewer.13"), imgFileName); //$NON-NLS-1$ - imgFileName = path + "sound.png"; - blockContainer4.setLabel("Sound", imgFileName); + imgFileName = path + "sound.png"; //$NON-NLS-1$ + blockContainer4.setLabel(Messages.getString("ATTBlockViewer.15"), imgFileName); //$NON-NLS-1$ - imgFileName = path + "TTS.png"; - blockContainer5.setLabel("TTS", imgFileName); + imgFileName = path + "TTS.png"; //$NON-NLS-1$ + blockContainer5.setLabel(Messages.getString("ATTBlockViewer.17"), imgFileName); //$NON-NLS-1$ return true; } @@ -681,12 +681,12 @@ if (isMajor) { yb = (int)(ATTConfig.TLV_TOP / 1.75); - g.drawString(String.format("[%s]", timeString), x - 25, 24); + g.drawString(String.format("[%s]", timeString), x - 25, 24); //$NON-NLS-1$ } else { yb = (int)(ATTConfig.TLV_TOP / 1.5); - g.drawString(String.format("[%s]", timeString), x - 22, 28); + g.drawString(String.format("[%s]", timeString), x - 22, 28); //$NON-NLS-1$ } g.drawLine(x, yb, x, ye); @@ -1177,7 +1177,7 @@ */ public void createAttitune() { - if (!loadAttitune("c:/template.att")) + if (!loadAttitune("c:/template.att")) //$NON-NLS-1$ { return; } @@ -1237,7 +1237,7 @@ * @param attFilePath * @return */ - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") //$NON-NLS-1$ public boolean loadAttitune(String attFilePath) { attituneFile = new ATTFormatReadWrite(); @@ -1260,36 +1260,36 @@ while (it.hasNext()) { key = (String)it.next(); - if (key.equals("truc")) + if (key.equals("truc")) //$NON-NLS-1$ { break; } blockStruct = (Hashtable<String,Object>)blocksStruct.get(key); - Double startTime = (Double)blockStruct.get("start_time"); - Double duration = (Double)blockStruct.get("duration"); + Double startTime = (Double)blockStruct.get("start_time"); //$NON-NLS-1$ + Double duration = (Double)blockStruct.get("duration"); //$NON-NLS-1$ - if (TuxAPIMisc.stringInStringArray(ATTBlockParams.LEDS_CMD_TYPES, (String)blockStruct.get("cmd"))) + if (TuxAPIMisc.stringInStringArray(ATTBlockParams.LEDS_CMD_TYPES, (String)blockStruct.get("cmd"))) //$NON-NLS-1$ { createBlock(ATTConfig.BLOCK_TYPE_LEDS, blockStruct, startTime, duration); } - else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.EYESMOUTH_CMD_TYPES, (String)blockStruct.get("cmd"))) + else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.EYESMOUTH_CMD_TYPES, (String)blockStruct.get("cmd"))) //$NON-NLS-1$ { createBlock(ATTConfig.BLOCK_TYPE_EYESMOUTH, blockStruct, startTime, duration); } - else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.FLIPPERS_CMD_TYPES, (String)blockStruct.get("cmd"))) + else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.FLIPPERS_CMD_TYPES, (String)blockStruct.get("cmd"))) //$NON-NLS-1$ { createBlock(ATTConfig.BLOCK_TYPE_WINGS, blockStruct, startTime, duration); } - else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.SPINNING_CMD_TYPES, (String)blockStruct.get("cmd"))) + else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.SPINNING_CMD_TYPES, (String)blockStruct.get("cmd"))) //$NON-NLS-1$ { createBlock(ATTConfig.BLOCK_TYPE_SPIN, blockStruct, startTime, duration); } - else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.WAVSOUND_CMD_TYPES, (String)blockStruct.get("cmd"))) + else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.WAVSOUND_CMD_TYPES, (String)blockStruct.get("cmd"))) //$NON-NLS-1$ { createBlock(ATTConfig.BLOCK_TYPE_WAV, blockStruct, startTime, duration). - loadWaveFile(attituneFile.getWaveFile((String)blockStruct.get("wav_name"))); + loadWaveFile(attituneFile.getWaveFile((String)blockStruct.get("wav_name"))); //$NON-NLS-1$ } - else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.TTS_CMD_TYPES, (String)blockStruct.get("cmd"))) + else if (TuxAPIMisc.stringInStringArray(ATTBlockParams.TTS_CMD_TYPES, (String)blockStruct.get("cmd"))) //$NON-NLS-1$ { createBlock(ATTConfig.BLOCK_TYPE_TTS, blockStruct, startTime, duration); } @@ -1340,7 +1340,7 @@ { Hashtable<String,Object> result = new Hashtable<String,Object>(); int count = 0; - String blockName = ""; + String blockName = ""; //$NON-NLS-1$ List<List<Object>> blocksSt; for (int i = 0; i < blockContainers.length; i++) @@ -1349,7 +1349,7 @@ for (int j = 0; j < blocksSt.size(); j++) { - blockName = String.format("block_%03d", count++); + blockName = String.format("block_%03d", count++); //$NON-NLS-1$ result.put(blockName, blocksSt.get(j).get(1)); } } @@ -1394,7 +1394,7 @@ * @param index * @param length */ - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") //$NON-NLS-1$ public void playScene(double index) { /* Translate the block format to the macro format */ @@ -1426,63 +1426,63 @@ for (int i = 0; i < cmds.length; i++) { cmdStruct = new Hashtable<String,Object>(); - cmdStruct.put("delay", (Double)blockStruct.get("start_time") + 0.5); - cmdStruct.put("cmd", cmds[i]); + cmdStruct.put("delay", (Double)blockStruct.get("start_time") + 0.5); //$NON-NLS-1$ //$NON-NLS-2$ + cmdStruct.put("cmd", cmds[i]); //$NON-NLS-1$ - cmd = (String)blockStruct.get("cmd"); + cmd = (String)blockStruct.get("cmd"); //$NON-NLS-1$ - if (cmd.equals("wav_play")) + if (cmd.equals("wav_play")) //$NON-NLS-1$ { - cmdStruct.put("delay", (Double)cmdStruct.get("delay") - 0.3); + cmdStruct.put("delay", (Double)cmdStruct.get("delay") - 0.3); //$NON-NLS-1$ //$NON-NLS-2$ if (attituneFile != null) { - wavPath = attituneFile.getWaveFile((String)blockStruct.get("wav_name")); - cmdStruct.put("wav_path", wavPath); + wavPath = attituneFile.getWaveFile((String)blockStruct.get("wav_name")); //$NON-NLS-1$ + cmdStruct.put("wav_path", wavPath); //$NON-NLS-1$ } } - else if (cmd.equals("tts_play")) + else if (cmd.equals("tts_play")) //$NON-NLS-1$ { - cmdStruct.put("delay", (Double)cmdStruct.get("delay") - 0.3); + cmdStruct.put("delay", (Double)cmdStruct.get("delay") - 0.3); //$NON-NLS-1$ //$NON-NLS-2$ } - if ((Double)cmdStruct.get("delay") >= index) + if ((Double)cmdStruct.get("delay") >= index) //$NON-NLS-1$ { - if (cmdStruct.containsKey("wav_path")) + if (cmdStruct.containsKey("wav_path")) //$NON-NLS-1$ { - cmdStr = String.format("OSL_CMD:WAV:PLAY:0.0,0.0,%s", - (String)cmdStruct.get("wav_path")); - cmdStruct.put("cmd", cmdStr); + cmdStr = String.format("OSL_CMD:WAV:PLAY:0.0,0.0,%s", //$NON-NLS-1$ + (String)cmdStruct.get("wav_path")); //$NON-NLS-1$ + cmdStruct.put("cmd", cmdStr); //$NON-NLS-1$ } - cmdStruct.put("delay", (Double)cmdStruct.get("delay") - index); + cmdStruct.put("delay", (Double)cmdStruct.get("delay") - index); //$NON-NLS-1$ //$NON-NLS-2$ macroStruct.add(cmdStruct); } - else if (cmdStruct.containsKey("wav_path")) + else if (cmdStruct.containsKey("wav_path")) //$NON-NLS-1$ { - idxb = index - (Double)cmdStruct.get("delay"); + idxb = index - (Double)cmdStruct.get("delay"); //$NON-NLS-1$ - if (idxb < (Double)blockStruct.get("duration")) + if (idxb < (Double)blockStruct.get("duration")) //$NON-NLS-1$ { - cmdStr = String.format("OSL_CMD:WAV:PLAY:%g,0.0,%s", + cmdStr = String.format("OSL_CMD:WAV:PLAY:%g,0.0,%s", //$NON-NLS-1$ idxb, - (String)cmdStruct.get("wav_path")); - cmdStruct.put("cmd", cmdStr); - cmdStruct.put("delay", 0.0); + (String)cmdStruct.get("wav_path")); //$NON-NLS-1$ + cmdStruct.put("cmd", cmdStr); //$NON-NLS-1$ + cmdStruct.put("delay", 0.0); //$NON-NLS-1$ macroStruct.add(cmdStruct); } } } } - macro = ""; + macro = ""; //$NON-NLS-1$ for (int i = 0; i < macroStruct.size(); i++) { - cmd = String.format("%g:%s|", - macroStruct.get(i).get("delay"), - macroStruct.get(i).get("cmd")); + cmd = String.format("%g:%s|", //$NON-NLS-1$ + macroStruct.get(i).get("delay"), //$NON-NLS-1$ + macroStruct.get(i).get("cmd")); //$NON-NLS-1$ macro += cmd; } - sendSimpleCmd(String.format("macro/play?macro=%s", macro)); + sendSimpleCmd(String.format("macro/play?macro=%s", macro)); //$NON-NLS-1$ } /** @@ -1490,7 +1490,7 @@ */ public void stop() { - sendSimpleCmd("macro/stop?"); + sendSimpleCmd("macro/stop?"); //$NON-NLS-1$ } /** @@ -1500,14 +1500,14 @@ public void playBlock(ATTBlock block) { String[] cmds = ATTBlockParams.attCmdToMacroCmd(block.getFunctionParams()); - String macro = ""; + String macro = ""; //$NON-NLS-1$ for (int i = 0; i < cmds.length; i++) { - macro += String.format("0.1:%s|", cmds[i]); + macro += String.format("0.1:%s|", cmds[i]); //$NON-NLS-1$ } - sendSimpleCmd(String.format("macro/play?macro=%s", macro)); + sendSimpleCmd(String.format("macro/play?macro=%s", macro)); //$NON-NLS-1$ } /** @@ -1548,7 +1548,7 @@ if (rowCopied == ATTConfig.BLOCK_TYPE_WAV) { newBlock.loadWaveFile(attituneFile.getWaveFile((String)blockCopied. - getFunctionParams().get("wav_name"))); + getFunctionParams().get("wav_name"))); //$NON-NLS-1$ } sceneHaveChanged = true; @@ -1565,19 +1565,19 @@ List<String> result = new ArrayList<String>(); /* Check author */ - if (attituneFile.getHeaderAuthor().equals("")) + if (attituneFile.getHeaderAuthor().equals("")) //$NON-NLS-1$ { - attituneFile.setHeaderAuthor("Attitune freak"); + attituneFile.setHeaderAuthor("Attitune freak"); //$NON-NLS-1$ } /* Check name */ - if (attituneFile.getHeaderName().equals("") || - attituneFile.getHeaderName().equals("template")) + if (attituneFile.getHeaderName().equals("") || //$NON-NLS-1$ + attituneFile.getHeaderName().equals("template")) //$NON-NLS-1$ { - if (attituneFile.getAttFileName().equals("template")) + if (attituneFile.getAttFileName().equals("template")) //$NON-NLS-1$ { - attituneFile.setHeaderName(""); - result.add("name"); + attituneFile.setHeaderName(""); //$NON-NLS-1$ + result.add("name"); //$NON-NLS-1$ } else { @@ -1589,39 +1589,39 @@ attituneFile.setHeaderLength(getRealSceneLength()); /* Check version */ - if (attituneFile.getHeaderVersion().equals("")) + if (attituneFile.getHeaderVersion().equals("")) //$NON-NLS-1$ { - attituneFile.setHeaderVersion("1.0"); + attituneFile.setHeaderVersion("1.0"); //$NON-NLS-1$ } /* Check description */ - if (attituneFile.getHeaderDescription().equals("")) + if (attituneFile.getHeaderDescription().equals("")) //$NON-NLS-1$ { - result.add("description"); + result.add("description"); //$NON-NLS-1$ } /* Check category */ - if (attituneFile.getHeaderCategory().equals("")) + if (attituneFile.getHeaderCategory().equals("")) //$NON-NLS-1$ { - result.add("category"); + result.add("category"); //$NON-NLS-1$ } /* Check sub category */ - if (attituneFile.getHeaderSubCategory().equals("")) + if (attituneFile.getHeaderSubCategory().equals("")) //$NON-NLS-1$ { - result.add("sub_category"); + result.add("sub_category"); //$NON-NLS-1$ } /* Check keywords */ String kw = attituneFile.getHeaderKeywords(); /* Remove bad chars */ - kw = kw.replace("[", ""); - kw = kw.replace("]", ""); - kw = kw.replace("'", ""); + kw = kw.replace("[", ""); //$NON-NLS-1$ //$NON-NLS-2$ + kw = kw.replace("]", ""); //$NON-NLS-1$ //$NON-NLS-2$ + kw = kw.replace("'", ""); //$NON-NLS-1$ //$NON-NLS-2$ attituneFile.setHeaderKeywords(kw); - if (attituneFile.getHeaderKeywords().replace(" ", "").equals("") || attituneFile.getHeaderKeywords().replace(" ", "").equals(",")) + if (attituneFile.getHeaderKeywords().replace(" ", "").equals("") || attituneFile.getHeaderKeywords().replace(" ", "").equals(",")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ { - attituneFile.setHeaderKeywords(attituneFile.getHeaderCategory() + ", " + attituneFile.getHeaderSubCategory()); + attituneFile.setHeaderKeywords(attituneFile.getHeaderCategory() + ", " + attituneFile.getHeaderSubCategory()); //$NON-NLS-1$ } @@ -1648,67 +1648,67 @@ { Hashtable<String,Object> blockStruct = block.getFunctionParams(); - if (blockStruct.containsKey("speaker")) + if (blockStruct.containsKey("speaker")) //$NON-NLS-1$ { - String speakerName = ATTBlockParams.LOCUTOR_NAMES_LIST[(Integer)blockStruct.get("speaker")-1]; - if (speakerName.equals("Bruno8k")) + String speakerName = ATTBlockParams.LOCUTOR_NAMES_LIST[(Integer)blockStruct.get("speaker")-1]; //$NON-NLS-1$ + if (speakerName.equals("Bruno8k")) //$NON-NLS-1$ { - attituneFile.setHeaderL... [truncated message content] |
From: remi <c2m...@c2...> - 2008-08-13 11:53:40
|
Author: remi Date: 2008-08-13 13:53:46 +0200 (Wed, 13 Aug 2008) New Revision: 1469 Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java Log: * update Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 10:32:18 UTC (rev 1468) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 11:53:46 UTC (rev 1469) @@ -51,6 +51,8 @@ private JFileChooser fileChooser; + private boolean confirmExit = false; + { //Set Look & Feel try { @@ -224,7 +226,7 @@ /* Play button */ playButton = new ATTSButton("Play", Color.BLACK, "/actionButton2Enable.png"); - playButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.png"))); + playButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); playButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -235,7 +237,7 @@ /* Stop button */ stopButton = new ATTSButton("Stop", Color.BLACK, "/actionButton2Enable.png"); - stopButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.png"))); + stopButton.setPressedIcon(new ImageIcon(getClass().getResource("/actionButton2Pressed.PNG"))); stopButton.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@ -365,6 +367,7 @@ { JOptionPane.showMessageDialog(this, "You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties>"); + confirmExit = false; return; } /* Check if the current scene is the template */ @@ -446,7 +449,12 @@ JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) { + confirmExit = true; onMenuItemSave(menuItem); + if (!confirmExit) + { + return; + } } } /* Destroy the viewer an exit the application */ @@ -459,7 +467,7 @@ */ public void onMenuItemCreate(MenuItem menuItem) { - System.out.println("Create"); + onCreateButtonPressed(null); } /* @@ -467,7 +475,7 @@ */ public void onMenuItemDelete(MenuItem menuItem) { - System.out.println("Delete"); + onDeleteButtonPressed(null); } /* @@ -475,7 +483,7 @@ */ public void onMenuItemCopy(MenuItem menuItem) { - System.out.println("Copy"); + onCopyButtonPressed(null); } /* @@ -483,7 +491,7 @@ */ public void onMenuItemPast(MenuItem menuItem) { - System.out.println("Past"); + onPastButtonPressed(null); } /* @@ -653,7 +661,15 @@ */ public void onDeleteButtonPressed(MouseEvent evt) { - attBlockViewer.deleteBlock(attBlockViewer.getFocusedBlock()); + int result = JOptionPane.showConfirmDialog( + this, + "You are sure that do you want deleting this block ?", + "Block deleting", + JOptionPane.YES_NO_OPTION); + if (result == JOptionPane.YES_OPTION) + { + attBlockViewer.deleteBlock(attBlockViewer.getFocusedBlock()); + } } /* Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-13 10:32:18 UTC (rev 1468) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-13 11:53:46 UTC (rev 1469) @@ -1401,6 +1401,12 @@ Hashtable<String,Object> blocksStruct = getBlocksStruct(); List<Hashtable<String,Object>> macroStruct = new ArrayList<Hashtable<String,Object>>(); String key; + + if (blocksStruct.size() == 0) + { + return; + } + Iterator<String> it = (Iterator<String>)blocksStruct.keys(); Hashtable<String,Object> blockStruct; Hashtable<String,Object> cmdStruct; |
From: remi <c2m...@c2...> - 2008-08-13 10:32:10
|
Author: remi Date: 2008-08-13 12:32:18 +0200 (Wed, 13 Aug 2008) New Revision: 1468 Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTFormatReadWrite.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTXmlParser.java Log: * update Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-12 23:02:08 UTC (rev 1467) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-13 10:32:18 UTC (rev 1468) @@ -17,6 +17,7 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.ComboBoxModel; @@ -25,6 +26,8 @@ import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JList; +import javax.swing.JFrame; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; @@ -127,6 +130,7 @@ private JTextArea jTextAreaDescription; private JTextField jTextFieldAuthor; private JTextField jTextFieldName; + private JButton jButtonClose; private JButton jButtonDelete; private JButton jButtonAdd; private JList jListKeywords; @@ -287,9 +291,6 @@ BoxLayout thisLayout = new BoxLayout(getContentPane(), javax.swing.BoxLayout.Y_AXIS); getContentPane().setLayout(thisLayout); this.addWindowListener(new WindowAdapter() { - public void windowOpened(WindowEvent evt) { - thisWindowOpened(evt); - } public void windowClosed(WindowEvent evt) { thisWindowClosed(evt); } @@ -308,7 +309,7 @@ { jLabelNeedChamp = new JLabel(); jPanelNeededChamps.add(jLabelNeedChamp); - jLabelNeedChamp.setText("The parameters marked as red color are wrong."); + jLabelNeedChamp.setText("The parameters marked as red color are missing."); jLabelNeedChamp.setBackground(new java.awt.Color(255,128,128)); jLabelNeedChamp.setForeground(new java.awt.Color(255,0,0)); } @@ -436,7 +437,7 @@ jPanel1.add(jButtonAdd, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); jButtonAdd.setText("Add"); jButtonAdd.addMouseListener(new MouseAdapter() { - public void mouseClicked(MouseEvent evt) { + public void mousePressed(MouseEvent evt) { jButtonAddMouseClicked(evt); } }); @@ -446,7 +447,7 @@ jPanel1.add(jButtonDelete, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); jButtonDelete.setText("Delete"); jButtonDelete.addMouseListener(new MouseAdapter() { - public void mouseClicked(MouseEvent evt) { + public void mousePressed(MouseEvent evt) { jButtonDeleteMouseClicked(evt); } }); @@ -459,39 +460,39 @@ jPanelValidate.setPreferredSize(new java.awt.Dimension(420, 25)); jPanelValidateLayout.rowWeights = new double[] {0.1}; jPanelValidateLayout.rowHeights = new int[] {7}; - jPanelValidateLayout.columnWeights = new double[] {0.0, 0.1, 0.1, 0.1, 0.0}; - jPanelValidateLayout.columnWidths = new int[] {7, 7, 7, 7, 7}; + jPanelValidateLayout.columnWeights = new double[] {0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + jPanelValidateLayout.columnWidths = new int[] {7, 136, 132, 7, 127, 7}; jPanelValidate.setLayout(jPanelValidateLayout); jPanelValidate.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED)); { jButtonValidate = new JButton(); - jPanelValidate.add(jButtonValidate, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + jPanelValidate.add(jButtonValidate, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); jButtonValidate.setText("Validate"); jButtonValidate.addMouseListener(new MouseAdapter() { - public void mouseClicked(MouseEvent evt) { + public void mousePressed(MouseEvent evt) { jButtonValidateMouseClicked(evt); } }); } + { + jButtonClose = new JButton(); + jPanelValidate.add(jButtonClose, new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + jButtonClose.setText("Close"); + jButtonClose.addMouseListener(new MouseAdapter() { + public void mousePressed(MouseEvent evt) { + jButtonCloseMouseClicked(evt); + } + }); + } } pack(); this.setSize(428, 425); } catch (Exception e) - { - + { } } - - /* - * On validate button clicked - */ - private void jButtonValidateMouseClicked(MouseEvent evt) - { - setParametersToTheHeader(); - fillParameters(); - } /* * On Category choosing @@ -544,34 +545,90 @@ } /* - * Before to close the window + * On add keyword button clicked */ - private void thisWindowClosing(WindowEvent evt) + private void jButtonAddMouseClicked(MouseEvent evt) { - System.out.println("this.windowClosing, event="+evt); - System.gc(); + String keyword = JOptionPane.showInputDialog("Enter your keyword :"); + + if (keyword == null) + { + return; + } + + if (!keyword.equals("")) + { + ((DefaultComboBoxModel)jListKeywords.getModel()).addElement(keyword); + } } /* - * On window closed + * On delete keyword button clicked */ - private void thisWindowClosed(WindowEvent evt) + private void jButtonDeleteMouseClicked(MouseEvent evt) { - System.out.println("this.windowClosed, event="+evt); + String selected = (String)jListKeywords.getSelectedValue(); + + if (selected == null) + { + return; + } + + if (!selected.equals("")) + { + ((DefaultComboBoxModel)jListKeywords.getModel()).removeElement(selected); + } } - private void thisWindowOpened(WindowEvent evt) { - System.out.println("this.windowOpened, event="+evt); - //TODO add your code for this.windowOpened + /* + * On validate button clicked + */ + private void jButtonValidateMouseClicked(MouseEvent evt) + { + setParametersToTheHeader(); + fillParameters(); + /* Check the header */ + List<String> badParams = blockViewer.checkHeader(); + if (badParams.size() > 0) + { + JOptionPane.showMessageDialog(this, + "Some parameters are missing."); + return; + } } - private void jButtonAddMouseClicked(MouseEvent evt) { - System.out.println("jButtonAdd.mouseClicked, event="+evt); - //TODO add your code for jButtonAdd.mouseClicked + /* + * On close button clicked + */ + private void jButtonCloseMouseClicked(MouseEvent evt) + { + WindowEvent we = new WindowEvent(this, WindowEvent.WINDOW_CLOSING); + for (WindowListener l : this.getWindowListeners()) + { + l.windowClosing(we); + } + this.dispose(); } - private void jButtonDeleteMouseClicked(MouseEvent evt) { - System.out.println("jButtonDelete.mouseClicked, event="+evt); - //TODO add your code for jButtonDelete.mouseClicked + /* + * Before to close the window + */ + private void thisWindowClosing(WindowEvent evt) + { + System.out.println(evt); + /* Check the header */ + List<String> badParams = blockViewer.checkHeader(); + if (badParams.size() > 0) + { + JOptionPane.showMessageDialog(this, + "Some parameters are missing."); + } } + + /* + * On window closed + */ + private void thisWindowClosed(WindowEvent evt) + { + } } Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-12 23:02:08 UTC (rev 1467) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-13 10:32:18 UTC (rev 1468) @@ -276,6 +276,15 @@ onMenuItemQuit(null); } + /* + * Event On properties window closed + */ + public void propertiesWindowClosed(WindowEvent evt) + { + System.out.println("The properties windows is closed !!"); + this.setTitle("Attitunes studio - " + attBlockViewer.attituneFile.getHeaderName()); + } + /* ------------------------------------------------------------------------ * Menu events * --------------------------------------------------------------------- */ @@ -340,6 +349,7 @@ if (attBlockViewer.loadAttitune(selFile.getPath())) { attBlockViewer.setAttituneIsTemplate(false); + JOptionPane.showMessageDialog(this, "The attitune has been loaded"); } } } @@ -353,7 +363,8 @@ List<String> badParams = attBlockViewer.checkHeader(); if (badParams.size() > 0) { - onMenuItemProperties(menuItem); + JOptionPane.showMessageDialog(this, + "You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties>"); return; } /* Check if the current scene is the template */ @@ -377,7 +388,8 @@ List<String> badParams = attBlockViewer.checkHeader(); if (badParams.size() > 0) { - onMenuItemProperties(menuItem); + JOptionPane.showMessageDialog(this, + "You must to set some parameters in your attitune before to save it.\n Goto the menu <File|Properties>"); return; } /* Open a file viewer to select an attitune */ @@ -408,6 +420,12 @@ public void onMenuItemProperties(MenuItem menuItem) { AttitunePropertiesFrame pFrame = new AttitunePropertiesFrame(attBlockViewer); + /* Close window */ + pFrame.addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent evt) { + propertiesWindowClosed(evt); + } + }); pFrame.setLocationRelativeTo(null); pFrame.setVisible(true); } @@ -577,6 +595,7 @@ statusBar.setLabel1("Position : " + ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); statusBar.setLabel2("Duration : " + ATTMisc.timeToString(attBlockViewer.getLength())); statusBar.setLabel3("Block start : 00:00:00"); + this.setTitle("Attitunes studio - " + attBlockViewer.attituneFile.getHeaderName()); } /* @@ -584,6 +603,7 @@ */ public void onAttituneSaved(ATTBlockViewer bv) { + JOptionPane.showMessageDialog(this, "Your attitune has been saved"); } /* ------------------------------------------------------------------------ Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTFormatReadWrite.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTFormatReadWrite.java 2008-08-12 23:02:08 UTC (rev 1467) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTFormatReadWrite.java 2008-08-13 10:32:18 UTC (rev 1468) @@ -139,6 +139,10 @@ Hashtable<String,Object> nodeScript = new Hashtable<String,Object>(); Hashtable<String,Object> nodeBody = new Hashtable<String,Object>(); + if (blocksStruct.size() == 0) + { + blocksStruct.put("truc", "Empty"); + } nodeScript.put("timeline", blocksStruct); nodeBody.put("script", nodeScript); newXmlStruct.put("body", nodeBody); Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTXmlParser.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTXmlParser.java 2008-08-12 23:02:08 UTC (rev 1467) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTXmlParser.java 2008-08-13 10:32:18 UTC (rev 1468) @@ -90,6 +90,12 @@ { String key; Node newNode; + + if (nodeStruct.size() < 1) + { + return; + } + Iterator<String> it = (Iterator<String>)nodeStruct.keys(); while (it.hasNext()) |
From: remi <c2m...@c2...> - 2008-08-12 23:02:08
|
Author: remi Date: 2008-08-13 01:02:08 +0200 (Wed, 13 Aug 2008) New Revision: 1467 Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java Log: * update Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java (rev 0) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttitunePropertiesFrame.java 2008-08-12 23:02:08 UTC (rev 1467) @@ -0,0 +1,577 @@ +package GUI; + +import java.util.List; +import java.util.ArrayList; +import java.util.Arrays; + +import java.awt.Frame; +import java.awt.Color; +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.ComboBoxModel; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.ListModel; +import javax.swing.border.BevelBorder; + +import com.tuxisalive.attitunes.*; +import com.tuxisalive.attitunes.format.*; +import com.tuxisalive.attitunes.block.ATTBlock; +import com.tuxisalive.attitunes.block.ATTBlockContainer; +import com.tuxisalive.attitunes.visual.ATTBlockViewer; + +/** +* This code was edited or generated using CloudGarden's Jigloo +* SWT/Swing GUI Builder, which is free for non-commercial +* use. If Jigloo is being used commercially (ie, by a corporation, +* company or business for any purpose whatever) then you +* should purchase a license for each developer using Jigloo. +* Please visit www.cloudgarden.com for details. +* Use of Jigloo implies acceptance of these licensing terms. +* A COMMERCIAL LICENSE HAS NOT BEEN PURCHASED FOR +* THIS MACHINE, SO JIGLOO OR THIS CODE CANNOT BE USED +* LEGALLY FOR ANY CORPORATE OR COMMERCIAL PURPOSE. +*/ +public class AttitunePropertiesFrame extends javax.swing.JFrame +{ + private static String[] ATT_CATEGORIES = { + "Others", + "Alert", + "Fun", + "Education", + "Music", + "Messages", + "Kids", + "System" + }; + + private static String[] ATT_CATEGORY_OTHERS = { + "Others" + }; + + private static String[] ATT_CATEGORY_ALERT = { + "General", + "RSS", + "Mail" + }; + + private static String[] ATT_CATEGORY_FUN = { + "General", + "Jokes", + "Sketches" + }; + + private static String[] ATT_CATEGORY_EDUCATION = { + "General", + "Language", + "Computer", + "Sport" + }; + + private static String[] ATT_CATEGORY_MUSIC = { + "General", + "Dance", + "Top 50", + "Bulletin / Chronicle" + }; + + private static String[] ATT_CATEGORY_MESSAGES = { + "Birthday", + "St Valentine day", + "Congrats", + "Christmas" + }; + + private static String[] ATT_CATEGORY_KIDS = { + "Stories", + "Games", + "Lullaby", + "Divers" + }; + + private static String[] ATT_CATEGORY_SYSTEM = { + "General", + "Battery", + "Lifeguard" + }; + + private static final long serialVersionUID = 1L; + private JPanel jPanelNeededChamps; + private JPanel jPanelChamps; + private JPanel jPanelValidate; + private JLabel jLabelNeedChamp; + private JButton jButtonValidate; + private JPanel jPanel1; + private JPanel jPanelKeywords; + private JComboBox jComboBoxSubCategory; + private JComboBox jComboBoxCategory; + private JTextField jTextFieldVersion; + private JTextArea jTextAreaDescription; + private JTextField jTextFieldAuthor; + private JTextField jTextFieldName; + private JButton jButtonDelete; + private JButton jButtonAdd; + private JList jListKeywords; + private JScrollPane jScrollPane1; + private JLabel jLabelPKeywords; + private JLabel jLabelPSubCategory; + private JLabel jLabelPCategory; + private JLabel jLabelPVersion; + private JLabel jLabelPDescription; + private JLabel jLabelPAuthor; + private JLabel jLabelPName; + + private ATTBlockViewer blockViewer; + + { + //Set Look & Feel + try { + javax.swing.UIManager.setLookAndFeel("com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); + } catch(Exception e) { + e.printStackTrace(); + } + } + + /* + * + */ + public AttitunePropertiesFrame(ATTBlockViewer blockViewer) + { + super(); + this.blockViewer = blockViewer; + /* Init the frame */ + initGUI(); + /* Fill the parameters */ + fillParameters(); + } + + /* + * + */ + private void fillParameters() + { + /* Get the bad parameters */ + List<String> badParams = blockViewer.checkHeader(); + + /* Name */ + jTextFieldName.setText(blockViewer.attituneFile.getHeaderName()); + if (badParams.contains("name")) + { + jLabelPName.setForeground(Color.RED); + } + else + { + jLabelPName.setForeground(Color.BLACK); + } + /* Author */ + jTextFieldAuthor.setText(blockViewer.attituneFile.getHeaderAuthor()); + + /* Description */ + jTextAreaDescription.setText(blockViewer.attituneFile.getHeaderDescription()); + if (badParams.contains("description")) + { + jLabelPDescription.setForeground(Color.RED); + } + else + { + jLabelPDescription.setForeground(Color.BLACK); + } + + /* Version */ + jTextFieldVersion.setText(blockViewer.attituneFile.getHeaderVersion()); + + /* Category */ + List<String> cat = new ArrayList<String>(); + cat.addAll(Arrays.asList(ATT_CATEGORIES)); + if (cat.contains(blockViewer.attituneFile.getHeaderCategory())) + { + jComboBoxCategory.setSelectedItem(blockViewer.attituneFile.getHeaderCategory()); + } + else + { + jComboBoxCategory.setSelectedItem("Others"); + } + + /* Sub category */ + List<String> scat = new ArrayList<String>(); + scat.addAll(Arrays.asList(getSubCategoryList(blockViewer.attituneFile.getHeaderCategory()))); + if (scat.contains(blockViewer.attituneFile.getHeaderSubCategory())) + { + jComboBoxSubCategory.setSelectedItem(blockViewer.attituneFile.getHeaderSubCategory()); + } + + /* Keywords */ + String[] keywords = blockViewer.attituneFile.getHeaderKeywords().split(", "); + ListModel jListKeywordsModel = new DefaultComboBoxModel(keywords); + jListKeywords.setModel(jListKeywordsModel); + } + + /* + * + */ + private void setParametersToTheHeader() + { + /* Set the name */ + blockViewer.attituneFile.setHeaderName(jTextFieldName.getText()); + /* Set the author */ + blockViewer.attituneFile.setHeaderAuthor(jTextFieldAuthor.getText()); + /* Set the description */ + String description = jTextAreaDescription.getText(); + description = description.replace("<", ""); + description = description.replace(">", ""); + description = description.replace("//", ""); + blockViewer.attituneFile.setHeaderDescription(description); + /* Set the version */ + blockViewer.attituneFile.setHeaderVersion(jTextFieldVersion.getText()); + /* Set the category */ + blockViewer.attituneFile.setHeaderCategory((String)jComboBoxCategory.getSelectedItem()); + /* Set the sub category */ + blockViewer.attituneFile.setHeaderSubCategory((String)jComboBoxSubCategory.getSelectedItem()); + /* Set the keywords */ + String keywords = ""; + for (int i = 0; i < jListKeywords.getModel().getSize(); i++) + { + keywords += (String)jListKeywords.getModel().getElementAt(i); + + if (i < jListKeywords.getModel().getSize() - 1) + { + keywords += ", "; + } + } + blockViewer.attituneFile.setHeaderKeywords(keywords); + /* Set the scene have changed */ + blockViewer.setSceneHaveChanged(true); + } + + /* + * + */ + private String[] getSubCategoryList(String category) + { + if (category.equals("Others")) return ATT_CATEGORY_OTHERS; + else if (category.equals("Alert")) return ATT_CATEGORY_ALERT; + else if (category.equals("Fun")) return ATT_CATEGORY_FUN; + else if (category.equals("Education")) return ATT_CATEGORY_EDUCATION; + else if (category.equals("Music")) return ATT_CATEGORY_MUSIC; + else if (category.equals("Messages")) return ATT_CATEGORY_MESSAGES; + else if (category.equals("Kids")) return ATT_CATEGORY_KIDS; + else if (category.equals("System")) return ATT_CATEGORY_SYSTEM; + else return ATT_CATEGORY_OTHERS; + } + + /* + * + */ + private void initGUI() + { + try + { + BoxLayout thisLayout = new BoxLayout(getContentPane(), javax.swing.BoxLayout.Y_AXIS); + getContentPane().setLayout(thisLayout); + this.addWindowListener(new WindowAdapter() { + public void windowOpened(WindowEvent evt) { + thisWindowOpened(evt); + } + public void windowClosed(WindowEvent evt) { + thisWindowClosed(evt); + } + public void windowClosing(WindowEvent evt) { + thisWindowClosing(evt); + } + }); + { + jPanelNeededChamps = new JPanel(); + getContentPane().add(jPanelNeededChamps); + jPanelNeededChamps.setSize(420, 20); + jPanelNeededChamps.setPreferredSize(new java.awt.Dimension(420, 29)); + jPanelNeededChamps.setMaximumSize(new java.awt.Dimension(32767, 20)); + jPanelNeededChamps.setMinimumSize(new java.awt.Dimension(10, 20)); + jPanelNeededChamps.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED)); + { + jLabelNeedChamp = new JLabel(); + jPanelNeededChamps.add(jLabelNeedChamp); + jLabelNeedChamp.setText("The parameters marked as red color are wrong."); + jLabelNeedChamp.setBackground(new java.awt.Color(255,128,128)); + jLabelNeedChamp.setForeground(new java.awt.Color(255,0,0)); + } + { + + } + + jPanelChamps = new JPanel(); + GridBagLayout jPanelChampsLayout = new GridBagLayout(); + getContentPane().add(jPanelChamps); + jPanelChampsLayout.rowWeights = new double[] {0.1, 0.1, 0.0, 0.1, 0.1, 0.1, 0.0, 0.1}; + jPanelChampsLayout.rowHeights = new int[] {20, 20, 60, 20, 20, 20, 92, 20}; + jPanelChampsLayout.columnWeights = new double[] {0.0, 0.0, 0.1, 0.0}; + jPanelChampsLayout.columnWidths = new int[] {7, 136, 7, 7}; + jPanelChamps.setLayout(jPanelChampsLayout); + jPanelChamps.setPreferredSize(new java.awt.Dimension(420, 321)); + jPanelChamps.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED)); + { + jLabelPName = new JLabel(); + BorderLayout jLabelPNameLayout = new BorderLayout(); + jLabelPName.setLayout(jLabelPNameLayout); + jPanelChamps.add(jLabelPName, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + jLabelPName.setText("Name :"); + } + { + jLabelPAuthor = new JLabel(); + jPanelChamps.add(jLabelPAuthor, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + jLabelPAuthor.setText("Author :"); + } + { + jLabelPDescription = new JLabel(); + jPanelChamps.add(jLabelPDescription, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + jLabelPDescription.setText("Description :"); + } + { + jLabelPVersion = new JLabel(); + jPanelChamps.add(jLabelPVersion, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + jLabelPVersion.setText("Version :"); + } + { + jLabelPCategory = new JLabel(); + jPanelChamps.add(jLabelPCategory, new GridBagConstraints(1, 4, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + jLabelPCategory.setText("Category :"); + } + { + jLabelPSubCategory = new JLabel(); + jPanelChamps.add(jLabelPSubCategory, new GridBagConstraints(1, 5, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + jLabelPSubCategory.setText("Sub category :"); + } + { + jLabelPKeywords = new JLabel(); + jPanelChamps.add(jLabelPKeywords, new GridBagConstraints(1, 6, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + jLabelPKeywords.setText("Keywords :"); + } + { + jTextFieldName = new JTextField(); + jPanelChamps.add(jTextFieldName, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + jTextFieldName.setAlignmentX(0.7f); + } + { + jTextFieldAuthor = new JTextField(); + jPanelChamps.add(jTextFieldAuthor, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + } + { + jTextAreaDescription = new JTextArea(); + jPanelChamps.add(jTextAreaDescription, new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); + jTextAreaDescription.setBorder(BorderFactory.createTitledBorder("")); + } + { + jTextFieldVersion = new JTextField(); + jPanelChamps.add(jTextFieldVersion, new GridBagConstraints(2, 3, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + } + { + ComboBoxModel jComboBoxCategoryModel = + new DefaultComboBoxModel(ATT_CATEGORIES); + jComboBoxCategory = new JComboBox(); + jPanelChamps.add(jComboBoxCategory, new GridBagConstraints(2, 4, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + jComboBoxCategory.setModel(jComboBoxCategoryModel); + jComboBoxCategory.setSelectedIndex(0); + jComboBoxCategory.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent evt) { + jComboBoxCategoryItemStateChanged(evt); + } + }); + } + { + ComboBoxModel jComboBoxSuCategoryModel = + new DefaultComboBoxModel(ATT_CATEGORY_OTHERS); + jComboBoxSubCategory = new JComboBox(); + jPanelChamps.add(jComboBoxSubCategory, new GridBagConstraints(2, 5, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + jComboBoxSubCategory.setModel(jComboBoxSuCategoryModel); + } + { + jPanelKeywords = new JPanel(); + BoxLayout jPanel1Layout = new BoxLayout(jPanelKeywords, javax.swing.BoxLayout.Y_AXIS); + jPanelKeywords.setLayout(jPanel1Layout); + jPanelChamps.add(jPanelKeywords, new GridBagConstraints(2, 6, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); + { + jScrollPane1 = new JScrollPane(); + jPanelKeywords.add(jScrollPane1); + jScrollPane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + jScrollPane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); + jScrollPane1.setPreferredSize(new java.awt.Dimension(266, 92)); + { + ListModel jListKeywordsModel = + new DefaultComboBoxModel( + new String[] {}); + jListKeywords = new JList(); + jScrollPane1.setViewportView(jListKeywords); + jListKeywords.setModel(jListKeywordsModel); + } + } + } + { + jPanel1 = new JPanel(); + GridBagLayout jPanel1Layout = new GridBagLayout(); + jPanelChamps.add(jPanel1, new GridBagConstraints(2, 7, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); + jPanel1Layout.rowWeights = new double[] {0.0, 0.1}; + jPanel1Layout.rowHeights = new int[] {0, 20}; + jPanel1Layout.columnWeights = new double[] {0.0, 0.0, 0.1}; + jPanel1Layout.columnWidths = new int[] {133, 7, 7}; + jPanel1.setLayout(jPanel1Layout); + { + jButtonAdd = new JButton(); + jPanel1.add(jButtonAdd, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + jButtonAdd.setText("Add"); + jButtonAdd.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + jButtonAddMouseClicked(evt); + } + }); + } + { + jButtonDelete = new JButton(); + jPanel1.add(jButtonDelete, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + jButtonDelete.setText("Delete"); + jButtonDelete.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + jButtonDeleteMouseClicked(evt); + } + }); + } + } + + jPanelValidate = new JPanel(); + GridBagLayout jPanelValidateLayout = new GridBagLayout(); + getContentPane().add(jPanelValidate); + jPanelValidate.setPreferredSize(new java.awt.Dimension(420, 25)); + jPanelValidateLayout.rowWeights = new double[] {0.1}; + jPanelValidateLayout.rowHeights = new int[] {7}; + jPanelValidateLayout.columnWeights = new double[] {0.0, 0.1, 0.1, 0.1, 0.0}; + jPanelValidateLayout.columnWidths = new int[] {7, 7, 7, 7, 7}; + jPanelValidate.setLayout(jPanelValidateLayout); + jPanelValidate.setBorder(BorderFactory.createEtchedBorder(BevelBorder.LOWERED)); + { + jButtonValidate = new JButton(); + jPanelValidate.add(jButtonValidate, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + jButtonValidate.setText("Validate"); + jButtonValidate.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + jButtonValidateMouseClicked(evt); + } + }); + } + } + + pack(); + this.setSize(428, 425); + } + catch (Exception e) + { + + } + } + + /* + * On validate button clicked + */ + private void jButtonValidateMouseClicked(MouseEvent evt) + { + setParametersToTheHeader(); + fillParameters(); + } + + /* + * On Category choosing + */ + @SuppressWarnings("static-access") + private void jComboBoxCategoryItemStateChanged(ItemEvent evt) + { + ComboBoxModel jComboBoxCategoryModel; + + if (evt.getStateChange() == evt.SELECTED) + { + if (evt.getItem().equals("Others")) + { + jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_OTHERS); + } + else if (evt.getItem().equals("Alert")) + { + jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_ALERT); + } + else if (evt.getItem().equals("Fun")) + { + jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_FUN); + } + else if (evt.getItem().equals("Education")) + { + jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_EDUCATION); + } + else if (evt.getItem().equals("Music")) + { + jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_MUSIC); + } + else if (evt.getItem().equals("Messages")) + { + jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_MESSAGES); + } + else if (evt.getItem().equals("Kids")) + { + jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_KIDS); + } + else if (evt.getItem().equals("System")) + { + jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_SYSTEM); + } + else + { + jComboBoxCategoryModel = new DefaultComboBoxModel(ATT_CATEGORY_OTHERS); + } + jComboBoxSubCategory.setModel(jComboBoxCategoryModel); + } + } + + /* + * Before to close the window + */ + private void thisWindowClosing(WindowEvent evt) + { + System.out.println("this.windowClosing, event="+evt); + System.gc(); + } + + /* + * On window closed + */ + private void thisWindowClosed(WindowEvent evt) + { + System.out.println("this.windowClosed, event="+evt); + } + + private void thisWindowOpened(WindowEvent evt) { + System.out.println("this.windowOpened, event="+evt); + //TODO add your code for this.windowOpened + } + + private void jButtonAddMouseClicked(MouseEvent evt) { + System.out.println("jButtonAdd.mouseClicked, event="+evt); + //TODO add your code for jButtonAdd.mouseClicked + } + + private void jButtonDeleteMouseClicked(MouseEvent evt) { + System.out.println("jButtonDelete.mouseClicked, event="+evt); + //TODO add your code for jButtonDelete.mouseClicked + } +} Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-12 18:14:00 UTC (rev 1466) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-12 23:02:08 UTC (rev 1467) @@ -9,6 +9,7 @@ import java.awt.event.WindowEvent; import java.awt.*; import java.util.Hashtable; +import java.util.List; import javax.swing.*; import com.tuxisalive.attitunes.*; @@ -348,6 +349,13 @@ */ public void onMenuItemSave(MenuItem menuItem) { + /* Check the header */ + List<String> badParams = attBlockViewer.checkHeader(); + if (badParams.size() > 0) + { + onMenuItemProperties(menuItem); + return; + } /* Check if the current scene is the template */ if (attBlockViewer.getAttituneIsTemplate()) { @@ -365,6 +373,13 @@ */ public void onMenuItemSaveAs(MenuItem menuItem) { + /* Check the header */ + List<String> badParams = attBlockViewer.checkHeader(); + if (badParams.size() > 0) + { + onMenuItemProperties(menuItem); + return; + } /* Open a file viewer to select an attitune */ if (fileChooser.showSaveDialog(this) == 1) { @@ -392,7 +407,9 @@ */ public void onMenuItemProperties(MenuItem menuItem) { - System.out.println("Properties"); + AttitunePropertiesFrame pFrame = new AttitunePropertiesFrame(attBlockViewer); + pFrame.setLocationRelativeTo(null); + pFrame.setVisible(true); } /* Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java 2008-08-12 18:14:00 UTC (rev 1466) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java 2008-08-12 23:02:08 UTC (rev 1467) @@ -21,16 +21,17 @@ public static Hashtable<String,Object> LEDS_BLINK_CANVAS = new Hashtable<String,Object>(); static { LEDS_BLINK_CANVAS.put("cmd", "leds_blink"); - LEDS_BLINK_CANVAS.put("count", 1); - LEDS_BLINK_CANVAS.put("speed", 1); + LEDS_BLINK_CANVAS.put("count", 1.0); + LEDS_BLINK_CANVAS.put("speed", 1.0); LEDS_BLINK_CANVAS.put("duration", 0.0); } private static String[] ledsBlinkTmc(Hashtable<String,Object> struct) { String[] result = new String[1]; - double duration = (Double)((Integer)struct.get("speed") * 0.008); - String cmd = String.format("TUX_CMD:LED:BLINK:LED_BOTH,%d,%g", - (Integer)struct.get("count"), duration); + Double speed = (Double)struct.get("speed"); + Double duration = (Double)(speed * 0.008); + String cmd = String.format("TUX_CMD:LED:BLINK:LED_BOTH,%g,%g", + (Double)struct.get("count"), duration); result[0] = cmd; return result; } Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-12 18:14:00 UTC (rev 1466) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-12 23:02:08 UTC (rev 1467) @@ -252,6 +252,15 @@ /** * + * @param value + */ + public void setSceneHaveChanged(Boolean value) + { + sceneHaveChanged = value; + } + + /** + * * @return */ public boolean getAttituneIsTemplate() @@ -1604,7 +1613,7 @@ kw = kw.replace("]", ""); kw = kw.replace("'", ""); attituneFile.setHeaderKeywords(kw); - if (attituneFile.getHeaderKeywords().equals("")) + if (attituneFile.getHeaderKeywords().replace(" ", "").equals("") || attituneFile.getHeaderKeywords().replace(" ", "").equals(",")) { attituneFile.setHeaderKeywords(attituneFile.getHeaderCategory() + ", " + attituneFile.getHeaderSubCategory()); |
From: remi <c2m...@c2...> - 2008-08-12 18:13:50
|
Author: remi Date: 2008-08-12 20:14:00 +0200 (Tue, 12 Aug 2008) New Revision: 1466 Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java Log: * update Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-12 17:28:03 UTC (rev 1465) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-12 18:14:00 UTC (rev 1466) @@ -376,7 +376,7 @@ return; } - attBlockViewer.checkHeader(); + System.out.println(attBlockViewer.checkHeader()); if (selFile.getPath().endsWith(".att")) { Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-12 17:28:03 UTC (rev 1465) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-12 18:14:00 UTC (rev 1466) @@ -1216,10 +1216,7 @@ { for (int i = 0; i < blockContainers.length; i++) { - for (int j = 0; j < blockContainers[i].blocks.size(); j++) - { - blockContainers[i].deleteBlock(j); - } + blockContainers[i].clearBlocks(); } recalcFullTime(); this.repaint(); @@ -1327,7 +1324,7 @@ return true; } - /* + /** * */ public Hashtable<String,Object> getBlocksStruct() @@ -1350,6 +1347,28 @@ return result; } + private Double getRealSceneLength() + { + Double result = 0.0; + Double blStart, blLength; + + for (int i = 0; i < blockContainers.length; i++) + { + for (int j = 0; j < blockContainers[i].blocks.size(); j++) + { + ATTBlock block = blockContainers[i].blocks.get(j); + blStart = block.getPosition(); + blLength = block.getLength(); + + if ((blStart + blLength) > result) + { + result = blStart + blLength; + } + } + } + return result; + } + /* * */ @@ -1540,11 +1559,19 @@ if (attituneFile.getHeaderName().equals("") || attituneFile.getHeaderName().equals("template")) { - attituneFile.setHeaderName(attituneFile.getAttFileName()); + if (attituneFile.getAttFileName().equals("template")) + { + attituneFile.setHeaderName(""); + result.add("name"); + } + else + { + attituneFile.setHeaderName(attituneFile.getAttFileName()); + } } /* Set the length */ - attituneFile.setHeaderLength(getLength()); + attituneFile.setHeaderLength(getRealSceneLength()); /* Check version */ if (attituneFile.getHeaderVersion().equals("")) @@ -1571,9 +1598,16 @@ } /* Check keywords */ + String kw = attituneFile.getHeaderKeywords(); + /* Remove bad chars */ + kw = kw.replace("[", ""); + kw = kw.replace("]", ""); + kw = kw.replace("'", ""); + attituneFile.setHeaderKeywords(kw); if (attituneFile.getHeaderKeywords().equals("")) { attituneFile.setHeaderKeywords(attituneFile.getHeaderCategory() + ", " + attituneFile.getHeaderSubCategory()); + } /* @@ -1582,51 +1616,71 @@ /* Get the first tts block */ if (blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.size() > 0) { - ATTBlock block = blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.get(0); - Hashtable<String,Object> blockStruct = block.getFunctionParams(); - if (blockStruct.containsKey("speaker")) + ATTBlock block = null; + + for (int i = 0; i < blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.size(); i++) { - String speakerName = ATTBlockParams.LOCUTOR_NAMES_LIST[(Integer)blockStruct.get("speaker")-1]; - if (speakerName.equals("Bruno8k")) + ATTBlock tBlock = blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.get(i); + + if (tBlock.aLive) { - attituneFile.setHeaderLanguage("French"); + block = tBlock; + break; } - else if (speakerName.equals("Julie8k")) + } + + if (block != null) + { + Hashtable<String,Object> blockStruct = block.getFunctionParams(); + + if (blockStruct.containsKey("speaker")) { - attituneFile.setHeaderLanguage("French"); + String speakerName = ATTBlockParams.LOCUTOR_NAMES_LIST[(Integer)blockStruct.get("speaker")-1]; + if (speakerName.equals("Bruno8k")) + { + attituneFile.setHeaderLanguage("French"); + } + else if (speakerName.equals("Julie8k")) + { + attituneFile.setHeaderLanguage("French"); + } + else if (speakerName.equals("Ryan8k")) + { + attituneFile.setHeaderLanguage("US English"); + } + else if (speakerName.equals("Heather8k")) + { + attituneFile.setHeaderLanguage("US English"); + } + else if (speakerName.equals("Sofie8k")) + { + attituneFile.setHeaderLanguage("Be Dutch"); + } + else if (speakerName.equals("Klaus8k")) + { + attituneFile.setHeaderLanguage("German"); + } + else if (speakerName.equals("Sarah8k")) + { + attituneFile.setHeaderLanguage("German"); + } + else if (speakerName.equals("Graham8k")) + { + attituneFile.setHeaderLanguage("UK English"); + } + else if (speakerName.equals("Lucy8k")) + { + attituneFile.setHeaderLanguage("UK English"); + } + else if (speakerName.equals("Femke8k")) + { + attituneFile.setHeaderLanguage("Nl Dutch"); + } + else + { + attituneFile.setHeaderLanguage("None"); + } } - else if (speakerName.equals("Ryan8k")) - { - attituneFile.setHeaderLanguage("US English"); - } - else if (speakerName.equals("Heather8k")) - { - attituneFile.setHeaderLanguage("US English"); - } - else if (speakerName.equals("Sofie8k")) - { - attituneFile.setHeaderLanguage("Be Dutch"); - } - else if (speakerName.equals("Klaus8k")) - { - attituneFile.setHeaderLanguage("German"); - } - else if (speakerName.equals("Sarah8k")) - { - attituneFile.setHeaderLanguage("German"); - } - else if (speakerName.equals("Graham8k")) - { - attituneFile.setHeaderLanguage("UK English"); - } - else if (speakerName.equals("Lucy8k")) - { - attituneFile.setHeaderLanguage("UK English"); - } - else if (speakerName.equals("Femke8k")) - { - attituneFile.setHeaderLanguage("Nl Dutch"); - } else { attituneFile.setHeaderLanguage("None"); |
From: remi <c2m...@c2...> - 2008-08-12 17:27:54
|
Author: remi Date: 2008-08-12 19:28:03 +0200 (Tue, 12 Aug 2008) New Revision: 1465 Removed: software_suite_v2/software/tools/attitunesStudio/trunk/images/aero.att Log: * deleted a file Deleted: software_suite_v2/software/tools/attitunesStudio/trunk/images/aero.att =================================================================== (Binary files differ) |
Author: remi Date: 2008-08-12 19:27:22 +0200 (Tue, 12 Aug 2008) New Revision: 1464 Added: software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/ software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/services/ software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/services/javax.swing.LookAndFeel software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneFileFilter.java Modified: software_suite_v2/software/tools/attitunesStudio/trunk/.classpath software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTFormatReadWrite.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTXmlParser.java software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java Log: * update Modified: software_suite_v2/software/tools/attitunesStudio/trunk/.classpath =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/.classpath 2008-08-11 14:00:52 UTC (rev 1463) +++ software_suite_v2/software/tools/attitunesStudio/trunk/.classpath 2008-08-12 17:27:22 UTC (rev 1464) @@ -2,6 +2,7 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry including="*.PNG|*.att|*.png" kind="src" path="images"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="C:/tuxdroid/lib/looks-2.1.4.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Added: software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF (rev 0) +++ software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/MANIFEST.MF 2008-08-12 17:27:22 UTC (rev 1464) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: main +Class-Path: ./attitunesStudio.jar; ./looks-2.1.4.jar Added: software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/services/javax.swing.LookAndFeel =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/services/javax.swing.LookAndFeel (rev 0) +++ software_suite_v2/software/tools/attitunesStudio/trunk/META-INF/services/javax.swing.LookAndFeel 2008-08-12 17:27:22 UTC (rev 1464) @@ -0,0 +1,8 @@ +# JGoodies Plastic L&F - replacement for Metal +com.jgoodies.looks.plastic.PlasticLookAndFeel +# JGoodies Plastic 3D L&F +com.jgoodies.looks.plastic.Plastic3DLookAndFeel +# JGoodies Plastic XP L&F +com.jgoodies.looks.plastic.PlasticXPLookAndFeel +# JGoodies Windows L&F +com.jgoodies.looks.windows.WindowsLookAndFeel Added: software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneFileFilter.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneFileFilter.java (rev 0) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/GUI/AttituneFileFilter.java 2008-08-12 17:27:22 UTC (rev 1464) @@ -0,0 +1,23 @@ +package GUI; + +import java.io.*; + +public class AttituneFileFilter extends javax.swing.filechooser.FileFilter +{ + public boolean accept(File file) { + String filename = file.getName(); + if (file.isDirectory()) + { + return true; + } + else + { + return filename.endsWith(".att"); + } + } + + public String getDescription() { + return "Attitune files"; + } + +} Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-11 14:00:52 UTC (rev 1463) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/MainFrame.java 2008-08-12 17:27:22 UTC (rev 1464) @@ -7,11 +7,10 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.awt.Color; import java.awt.*; import java.util.Hashtable; -import javax.swing.ImageIcon; +import javax.swing.*; import com.tuxisalive.attitunes.*; import com.tuxisalive.attitunes.format.*; import com.tuxisalive.attitunes.block.ATTBlock; @@ -19,6 +18,8 @@ import com.tuxisalive.attitunes.visual.ATTBlockViewer; import com.tuxisalive.attitunes.visual.ATTSButton; +import java.io.*; + //import javax.swing.JOptionPane; /** @@ -46,6 +47,17 @@ private ATTSButton pastButton; private ATTSButton playButton; private ATTSButton stopButton; + + private JFileChooser fileChooser; + + { + //Set Look & Feel + try { + javax.swing.UIManager.setLookAndFeel("com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); + } catch(Exception e) { + e.printStackTrace(); + } + } /** * MainFrame constructor @@ -132,9 +144,6 @@ attBlockViewer.events.register(ATTConfig.EVENT_ATTITUNE_LOADED, this, "onAttituneLoaded"); attBlockViewer.events.register(ATTConfig.EVENT_ATTITUNE_SAVED, this, "onAttituneSaved"); - /* Load a file */ - attBlockViewer.loadAttitune(ATTResources.getRealPath("aero.att")); - /* Zoom plus button */ zoomPlusButton = new ATTSButton("/zoomPlusButton.png"); zoomPlusButton.setPressedIcon(new ImageIcon(getClass().getResource("/zoomPressedButton.png"))); @@ -235,9 +244,18 @@ attBlockViewer.add(stopButton, new AnchorConstraint(10, 273)); attBlockViewer.repaint(); + /* Create the file chooser */ + fileChooser = new JFileChooser(); + fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); + fileChooser.addChoosableFileFilter(new AttituneFileFilter()); + /* Pack the components and set the frame size */ pack(); setSize(648, 400); + + /* Load the template file */ + attBlockViewer.loadAttitune("C:/tuxdroid/resources/templates/template.att"); + attBlockViewer.setAttituneIsTemplate(true); } catch (Exception e) { @@ -254,8 +272,7 @@ */ private void thisWindowClosing(WindowEvent evt) { - attBlockViewer.destroy(); - System.exit(0); + onMenuItemQuit(null); } /* ------------------------------------------------------------------------ @@ -267,7 +284,25 @@ */ public void onMenuItemNew(MenuItem menuItem) { - System.out.println("New"); + /* Check if the current scene need to be saved */ + if (attBlockViewer.getSceneHaveChanged()) + { + /* Save the changes first */ + int result = JOptionPane.showConfirmDialog( + this, + "Save changes before to continue ?", + "Scene have changed", + JOptionPane.YES_NO_OPTION); + if (result == JOptionPane.YES_OPTION) + { + onMenuItemSave(menuItem); + } + } + /* Load the template */ + if (attBlockViewer.loadAttitune("C:/tuxdroid/resources/templates/template.att")) + { + attBlockViewer.setAttituneIsTemplate(true); + } } /* @@ -279,9 +314,33 @@ if (attBlockViewer.getSceneHaveChanged()) { /* Save the changes first */ - /* if not changed exit the function */ + int result = JOptionPane.showConfirmDialog( + this, + "Save changes before to continue ?", + "Scene have changed", + JOptionPane.YES_NO_OPTION); + if (result == JOptionPane.YES_OPTION) + { + onMenuItemSave(menuItem); + } } /* Load a file viewer to select an attitune */ + if (fileChooser.showOpenDialog(this) == 1) + { + return; + } + File selFile = fileChooser.getSelectedFile(); + if (selFile == null) + { + return; + } + if (selFile.getPath().endsWith(".att")) + { + if (attBlockViewer.loadAttitune(selFile.getPath())) + { + attBlockViewer.setAttituneIsTemplate(false); + } + } } /* @@ -289,13 +348,16 @@ */ public void onMenuItemSave(MenuItem menuItem) { - /* Check if the current scene if the template */ + /* Check if the current scene is the template */ if (attBlockViewer.getAttituneIsTemplate()) { onMenuItemSaveAs(menuItem); } /* Save the attitune */ - //attBlockViewer + else + { + attBlockViewer.saveAttitune(attBlockViewer.attituneFile.getAttFilePath()); + } } /* @@ -303,7 +365,26 @@ */ public void onMenuItemSaveAs(MenuItem menuItem) { - System.out.println("Save as"); + /* Open a file viewer to select an attitune */ + if (fileChooser.showSaveDialog(this) == 1) + { + return; + } + File selFile = fileChooser.getSelectedFile(); + if (selFile == null) + { + return; + } + + attBlockViewer.checkHeader(); + + if (selFile.getPath().endsWith(".att")) + { + if (attBlockViewer.saveAttitune(selFile.getPath())) + { + attBlockViewer.setAttituneIsTemplate(false); + } + } } /* @@ -319,7 +400,23 @@ */ public void onMenuItemQuit(MenuItem menuItem) { - System.out.println("Quit"); + /* Check if the current scene need to be saved */ + if (attBlockViewer.getSceneHaveChanged()) + { + /* Save the changes first */ + int result = JOptionPane.showConfirmDialog( + this, + "Save changes before to continue ?", + "Scene have changed", + JOptionPane.YES_NO_OPTION); + if (result == JOptionPane.YES_OPTION) + { + onMenuItemSave(menuItem); + } + } + /* Destroy the viewer an exit the application */ + attBlockViewer.destroy(); + System.exit(0); } /* @@ -462,6 +559,7 @@ { statusBar.setLabel1("Position : " + ATTMisc.timeToString(attBlockViewer.getCurrentPosition())); statusBar.setLabel2("Duration : " + ATTMisc.timeToString(attBlockViewer.getLength())); + statusBar.setLabel3("Block start : 00:00:00"); } /* @@ -543,7 +641,6 @@ public void onPlayButtonPressed(MouseEvent evt) { attBlockViewer.playScene(attBlockViewer.getCurrentPosition()); - attBlockViewer.saveAttitune("c:\\aero3.att"); } /* Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java 2008-08-11 14:00:52 UTC (rev 1463) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTBlockParams.java 2008-08-12 17:27:22 UTC (rev 1464) @@ -427,7 +427,7 @@ /* * Locutor name list */ - private static String[] LOCUTOR_NAMES_LIST = { + public static String[] LOCUTOR_NAMES_LIST = { "Bruno8k", "Julie8k", "Ryan8k", "Heather8k","Sofie8k", "Klaus8k", "Sarah8k", "Graham8k","Lucy8k", "Salma8k", "Mette8k", "Maria8k", "Chiara8k", "Femke8k", "Kari8k", Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTFormatReadWrite.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTFormatReadWrite.java 2008-08-11 14:00:52 UTC (rev 1463) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTFormatReadWrite.java 2008-08-12 17:27:22 UTC (rev 1464) @@ -95,7 +95,15 @@ /* Get the blocks structure from the xml structure */ blocksStruct = (Hashtable)xmlStruct.get("body"); blocksStruct = (Hashtable)blocksStruct.get("script"); - blocksStruct = (Hashtable)blocksStruct.get("timeline"); + if (((Hashtable)blocksStruct).containsKey("timeline")) + { + blocksStruct = (Hashtable)blocksStruct.get("timeline"); + } + else + { + blocksStruct = new Hashtable<String,Object>(); + } + System.out.println(blocksStruct); /* Get the header structure */ headerStruct = (Hashtable)xmlStruct.get("header"); @@ -145,7 +153,7 @@ String newWorkPath = tmpAttDir.getPath() + File.separator + newFileName + File.separator; /* Copy the new directory if != of the current one */ - if (newFileName != attFileName) + if (!newFileName.equals(attFileName)) { String destDir = newWorkPath + newFileName + File.separator; String srcDir = attWorkPath + attFileName + File.separator; @@ -174,7 +182,16 @@ return attFilePath; } + /** + * + * @return + */ + public String getAttFileName() + { + return attFileName; + } + /** * * @return Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTXmlParser.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTXmlParser.java 2008-08-11 14:00:52 UTC (rev 1463) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/format/ATTXmlParser.java 2008-08-12 17:27:22 UTC (rev 1464) @@ -186,7 +186,15 @@ e = (Element)childNode; childType = e.getAttribute("type"); childName = childNode.getNodeName(); - childValue = childNode.getFirstChild().getNodeValue(); + if (!childNode.hasChildNodes()) + { + childValue = ""; + childType = "str"; + } + else + { + childValue = childNode.getFirstChild().getNodeValue(); + } if (childType.equals("str")) { Modified: software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java =================================================================== --- software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-11 14:00:52 UTC (rev 1463) +++ software_suite_v2/software/tools/attitunesStudio/trunk/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2008-08-12 17:27:22 UTC (rev 1464) @@ -261,6 +261,15 @@ /** * + * @param value + */ + public void setAttituneIsTemplate(boolean value) + { + attituneIsTemplate = value; + } + + /** + * * @param path * @return */ @@ -462,12 +471,12 @@ if (scrollbarIsFocused) { scrollbarIsFocused = false; - sceneHaveChanged = true; events.emit(ATTConfig.EVENT_SCROLLBAR_DRAG_STOPPED); } if (draggingBlock) { draggingBlock = false; + sceneHaveChanged = true; events.emit(ATTConfig.EVENT_BLOCK_DRAG_STOPPED, (ATTBlock)focusedBlock); } @@ -1202,6 +1211,23 @@ /** * + */ + public void deleteAllBlocks() + { + for (int i = 0; i < blockContainers.length; i++) + { + for (int j = 0; j < blockContainers[i].blocks.size(); j++) + { + blockContainers[i].deleteBlock(j); + } + } + recalcFullTime(); + this.repaint(); + sceneHaveChanged = true; + } + + /** + * * @param attFilePath * @return */ @@ -1216,6 +1242,9 @@ return false; } + /* Delete old blocks */ + deleteAllBlocks(); + /* Load blocks */ Hashtable<String,Object> blocksStruct = attituneFile.getBocksStruct(); Hashtable<String,Object> blockStruct; @@ -1225,6 +1254,10 @@ while (it.hasNext()) { key = (String)it.next(); + if (key.equals("truc")) + { + break; + } blockStruct = (Hashtable<String,Object>)blocksStruct.get(key); Double startTime = (Double)blockStruct.get("start_time"); Double duration = (Double)blockStruct.get("duration"); @@ -1258,6 +1291,8 @@ this.repaint(); attituneIsTemplate = false; + sceneHaveChanged = false; + focusedRowIndex = 0; events.emit(ATTConfig.EVENT_ATTITUNE_LOADED, this); return true; } @@ -1277,7 +1312,7 @@ { return false; } - sceneHaveChanged = true; + sceneHaveChanged = false; events.emit(ATTConfig.EVENT_ATTITUNE_SAVED, this); /* Reload the attitune */ @@ -1486,4 +1521,127 @@ return newBlock; } + + /** + * + * @return + */ + public List<String> checkHeader() + { + List<String> result = new ArrayList<String>(); + + /* Check author */ + if (attituneFile.getHeaderAuthor().equals("")) + { + attituneFile.setHeaderAuthor("Attitune freak"); + } + + /* Check name */ + if (attituneFile.getHeaderName().equals("") || + attituneFile.getHeaderName().equals("template")) + { + attituneFile.setHeaderName(attituneFile.getAttFileName()); + } + + /* Set the length */ + attituneFile.setHeaderLength(getLength()); + + /* Check version */ + if (attituneFile.getHeaderVersion().equals("")) + { + attituneFile.setHeaderVersion("1.0"); + } + + /* Check description */ + if (attituneFile.getHeaderDescription().equals("")) + { + result.add("description"); + } + + /* Check category */ + if (attituneFile.getHeaderCategory().equals("")) + { + result.add("category"); + } + + /* Check sub category */ + if (attituneFile.getHeaderSubCategory().equals("")) + { + result.add("sub_category"); + } + + /* Check keywords */ + if (attituneFile.getHeaderKeywords().equals("")) + { + attituneFile.setHeaderKeywords(attituneFile.getHeaderCategory() + ", " + attituneFile.getHeaderSubCategory()); + } + + /* + * Check language + */ + /* Get the first tts block */ + if (blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.size() > 0) + { + ATTBlock block = blockContainers[ATTConfig.BLOCK_TYPE_TTS].blocks.get(0); + Hashtable<String,Object> blockStruct = block.getFunctionParams(); + if (blockStruct.containsKey("speaker")) + { + String speakerName = ATTBlockParams.LOCUTOR_NAMES_LIST[(Integer)blockStruct.get("speaker")-1]; + if (speakerName.equals("Bruno8k")) + { + attituneFile.setHeaderLanguage("French"); + } + else if (speakerName.equals("Julie8k")) + { + attituneFile.setHeaderLanguage("French"); + } + else if (speakerName.equals("Ryan8k")) + { + attituneFile.setHeaderLanguage("US English"); + } + else if (speakerName.equals("Heather8k")) + { + attituneFile.setHeaderLanguage("US English"); + } + else if (speakerName.equals("Sofie8k")) + { + attituneFile.setHeaderLanguage("Be Dutch"); + } + else if (speakerName.equals("Klaus8k")) + { + attituneFile.setHeaderLanguage("German"); + } + else if (speakerName.equals("Sarah8k")) + { + attituneFile.setHeaderLanguage("German"); + } + else if (speakerName.equals("Graham8k")) + { + attituneFile.setHeaderLanguage("UK English"); + } + else if (speakerName.equals("Lucy8k")) + { + attituneFile.setHeaderLanguage("UK English"); + } + else if (speakerName.equals("Femke8k")) + { + attituneFile.setHeaderLanguage("Nl Dutch"); + } + else + { + attituneFile.setHeaderLanguage("None"); + } + } + else + { + attituneFile.setHeaderLanguage("None"); + } + } + else + { + attituneFile.setHeaderLanguage("None"); + } + + return result; + } } |
From: jaguarondi <c2m...@c2...> - 2008-08-11 14:00:44
|
Author: jaguarondi Date: 2008-08-11 16:00:52 +0200 (Mon, 11 Aug 2008) New Revision: 1463 Modified: software_suite_v1/daemon/trunk/libs/USBDaemon_status_table.c software_suite_v1/daemon/trunk/versioning.c Log: * Updated so the versioning of the latest USB firmware works again. Modified: software_suite_v1/daemon/trunk/libs/USBDaemon_status_table.c =================================================================== --- software_suite_v1/daemon/trunk/libs/USBDaemon_status_table.c 2008-08-11 13:11:24 UTC (rev 1462) +++ software_suite_v1/daemon/trunk/libs/USBDaemon_status_table.c 2008-08-11 14:00:52 UTC (rev 1463) @@ -755,7 +755,7 @@ case PONG_CMD: pong_received++; pong_event(new_status[1], pong_received); - log_debug("pong %d %d %d %d", new_status[1], new_status[2], + log_debug("pong %u %u %u %u", new_status[1], new_status[2], new_status[3], pong_received ); break; Modified: software_suite_v1/daemon/trunk/versioning.c =================================================================== --- software_suite_v1/daemon/trunk/versioning.c 2008-08-11 13:11:24 UTC (rev 1462) +++ software_suite_v1/daemon/trunk/versioning.c 2008-08-11 14:00:52 UTC (rev 1463) @@ -105,15 +105,12 @@ */ void tux_information_cleaning(void) { - int firmware_num[4] = {TUXCORE_CPU_NUM, TUXAUDIO_CPU_NUM, TUXRF_CPU_NUM, - RELEASE_INDEX}; - struct firmware_info_t *firmware; int i; - for (i=0; i<4; i++) + for (i=0; i<NUMBER_OF_FIRMWARE-1; i++) { - firmware = &tux_status.firmware_info[firmware_num[i]]; - memset((char*)firmware, 0, sizeof(struct firmware_info_t)); + memset((char*)&tux_status.firmware_info[i], 0, + sizeof(struct firmware_info_t)); } tux_status.sound_flash.number_of_sounds = 0; } @@ -140,7 +137,7 @@ firmware->version_update = data[3]; log_debug("FW: version of %s: %d.%d.%d", cpu_name[current_cpu], - CPU_VER_MAJ(firmware->version_major), firmware->version_minor, + firmware->version_major, firmware->version_minor, firmware->version_update); } @@ -380,6 +377,10 @@ break; } usb_command[1] = info_cpu_cmd[cpu_num]; + if (cpu_num == FUXUSB_CPU_NUM) + usb_command[0] = USB_DONGLE_CMD; + else + usb_command[0] = USB_TUX_CMD; /* By-pass if we already have the information. We need to do that * otherwise the command will be sent and the version_string * detected immediately after even though we might not yet have |
From: jaguarondi <c2m...@c2...> - 2008-08-11 13:11:17
|
Author: jaguarondi Date: 2008-08-11 15:11:24 +0200 (Mon, 11 Aug 2008) New Revision: 1462 Added: firmware/hex/tags/0.5.0-libusb/ firmware/hex/tags/0.5.0-libusb/fuxrf.hex firmware/hex/tags/0.5.0-libusb/fuxusb.hex firmware/hex/tags/0.5.0-libusb/info.xml firmware/hex/tags/0.5.0-libusb/tuxaudio.eep firmware/hex/tags/0.5.0-libusb/tuxaudio.hex firmware/hex/tags/0.5.0-libusb/tuxcore.eep firmware/hex/tags/0.5.0-libusb/tuxcore.hex firmware/hex/tags/0.5.0-libusb/tuxrf.hex Log: * Tagging 0.5.0-libusb hex files. Added: firmware/hex/tags/0.5.0-libusb/fuxrf.hex =================================================================== --- firmware/hex/tags/0.5.0-libusb/fuxrf.hex (rev 0) +++ firmware/hex/tags/0.5.0-libusb/fuxrf.hex 2008-08-11 13:11:24 UTC (rev 1462) @@ -0,0 +1,235 @@ +:1000000021C03AC039C038C037C036C035C034C04E +:1000100033C032C031C0D5C42FC02EC02DC02CC0BB +:100020002BC02AC0E3C6B1C6D0C626C025C024C096 +:1000300023C022C071C5E7C456C56EC575C59DC530 +:10004000ACC5C0C511241FBECFEFD2E0DEBFCDBF0F +:1000500011E0A0E0B1E0EAE8FEE002C005900D92F8 +:10006000A030B107D9F711E0A0E0B1E001C01D92C6 +:10007000A030B107E1F701C0C3CFCFEFD2E0DEBFC0 +:10008000CDBF1A9901C041C7E4D1F8D1A9D276D227 +:100090008093FC0122D2109287017894A0E0B0E016 +:1000A000ECD6802D992780939101809191018F3F0B +:1000B00019F485E080939101BCD25F9841E15091A1 +:1000C000F10E752F7F718091C1018823E1F31092A9 +:1000D000C1011092C2011092F20120E02093F301BD +:1000E0001A9BFECF429A1A99FECF42988091F50151 +:1000F000882309F445C01092F5018091F701882307 +:1001000049F11092F7018091020180FF0CC08091AB +:10011000020182FF2BC08091020181FF23C08091E8 +:10012000F20182600BC08091020181FF17C08091B3 +:10013000020182FF1FC08091F20181608093F20171 +:100140008091F20184608093F20122E882E2809340 +:10015000F40118C08091020180FF08C08091020163 +:1001600082FF0EC08091F201826007C0809102017F +:1001700081FF06C08091F20181608093F20122E04C +:100180004093F4018091F601882341F01092F6012A +:1001900028608091F20188608093F2018091F801DB +:1001A000882331F028608091F20180618093F20110 +:1001B0008091850187FF58C028608091F201886096 +:1001C0008093F201809185018038B9F48091F00E1E +:1001D0008093FD01852F807E8093FE018091FE013A +:1001E000872B8093FE018091F20E8093FF01809116 +:1001F000F30E8093000281E819C080918501813857 +:10020000D9F48091F40E8093FD018091F50E9091C8 +:10021000F60E892F99278093FE018091F50E809329 +:10022000FF018091F70E8093000282E880938501A0 +:100230001BC01092F10147CF809185018238A1F453 +:100240008091F80E8093FD018091F90E9091FA0E45 +:10025000892F99278093FE018091F90E8093FF01E9 +:100260008091FB0E809300022EBD40980DB407FED6 +:10027000FDCF61E01A99C5C0409A8091C2018731D3 +:1002800098F48091F101882339F08091C201E82F20 +:10029000FF27ED53FE4F06C08091C201E82FFF27D4 +:1002A000E652FE4F8EB580838091C2018F5F8093AE +:1002B000C2019091F301992309F044C08091F201A9 +:1002C00082FF1CC08091F20180FF0CC08091C201AE +:1002D000823120F18091C201E82FFF27E850FF4FC3 +:1002E000808123C08091C201823160F08091C2017F +:1002F000E82FFF27E050FF4F878517C08091F2015C +:1003000080FF08C08091C201E82FFF27E050FF4F17 +:1003100081850BC08091F20181FF09C08091C201EB +:10032000E82FFF27E050FF4F80A18EBD01C09EBD8A +:100330009091C2018091F401981709F061C0609317 +:10034000F3015EC08091F3018130C9F58091F20123 +:1003500083FF1FC08091850187FF07C08091C20184 +:10036000E82FFF27E551FE4F11C08091F20182FF77 +:1003700007C08091C201E82FFF27ED51FF4F06C053 +:100380008091C201E82FFF27EC50FF4F80818EBD86 +:1003900001C01EBC8091C201282F33278091F40137 +:1003A000992704962817390759F582E08093F301BD +:1003B00080918501823821F51092850121C08091BC +:1003C000F3018230F1F48091F20184FF0AC0809140 +:1003D000F8018EBD8091F801813021F01092F80172 +:1003E00001C01EBC8091C201282F33278091F401E7 +:1003F000992705962817390719F483E08093F301AC +:1004000040980DB407FEFDCF8091F301833009F0D1 +:1004100031CF409A8091C201873198F48091F101E7 +:10042000882339F08091C201E82FFF27ED53FE4F5A +:1004300006C08091C201E82FFF27E652FE4F8EB51D +:1004400080838091F101882309F0F3CE6093F1015C +:100450003ACE80E285B983E184B981E388B98FE03F +:1004600087B980EC8BB986EA8AB985E08093C400AD +:1004700080E48CBD1DBC0DB40EB408958DB780957D +:10048000E0E0F1E02FEF32E0281B3109E217F3073B +:1004900010F41192FBCF109290011092A8011092CB +:1004A000A60181E08093A7011092BE011092BD01C8 +:1004B0001092BF011092C1011092F1011092F5014A +:1004C0001092F6011092F7011092F8011092F901C2 +:1004D0001092FA011092850108951F9395E590936B +:1004E00042018091420180934101809141018093BA +:1004F0004001909345018091450180934401809192 +:100500004401809343018FEF80934701809147011D +:1005100080934601809187018093480116E31093F0 +:10052000490110934A0110934B0187E080934C01DD +:1005300081E080934D0110924E018091FC018093E7 +:100540004F0190935001909351013DD01093810140 +:100550008091FC0180938201109383011F91089583 +:1005600020E0281750F49FE0000000000000000089 +:10057000915097FFF9CF2F5FF4CF0895CF93D6D145 +:100580005D9AC0E02C2F00002F5F2F3FE1F740E085 +:1005900050E020E4CA0187709070892B19F4CC0FC9 +:1005A0004899C16021504F5F5F4F27FFF3CF01D2C1 +:1005B0008C2F9927CF910895E1DF8F77803608F04F +:1005C0008C5399270895ECE4F1E020E090914C01E0 +:1005D000923020F0819128279150FACF20830895FE +:1005E000FF920F931F93CF93E7DF80939201C1E0B7 +:1005F00081E0F82E0C2F11270E561E4FDDDFF8017B +:10060000808320E0D801E22FFF27EE56FE4F9C9119 +:100610008081981721F02F5FC217A9F702C0FF2031 +:1006200049F7CF5FC43120F3CF911F910F91FF9015 +:10063000089580918601806480938601BAD188D321 +:100640001092C0001092C1001092C20080E290E0AF +:100650009093890080938800809190018823E1F332 +:10066000109290018091010181FFF6CF8091FC01F1 +:1006700080934A0180914D01846080934D01A3DFF6 +:10068000809190018823E1F3109290018091010103 +:1006900081FFF6CF8091010182FFF2CF84E3809346 +:1006A0004C019FEFE2E5F1E083E09193815087FFF9 +:1006B000FCCF95E5E6E5F1E088E29193815087FF74 +:1006C000FCCF81DF8091860180618093860108954F +:1006D0008091860185FFDCC08091A70184FF12C054 +:1006E00080919001882371F08091010184FF0AC0FC +:1006F0001092900180914D01877F80934D0180E29F +:100700008093A70180914E0180FF31C080914E01FE +:1007100082FF04C084E080934E0102C010924E011B +:100720008091F101882381F48091C30181FF50C041 +:10073000A4ECB1E0E1E4F1E090E18D91858B915082 +:10074000319697FFFACF0FC08091DA0181FF40C048 +:10075000ABEDB1E0E1E4F1E090E18D91858B91505A +:10076000319697FFFACF80914E0182602FC0809121 +:100770004E0181FF02C083E001C081E080934E0101 +:100780008091F101882381F48091C30181FF20C011 +:10079000A4ECB1E0E1E4F1E090E18D9184A7915007 +:1007A000319697FFFACF0FC08091DA0181FF10C018 +:1007B000ABEDB1E0E1E4F1E090E18D9184A79150DF +:1007C000319697FFFACF80914E01846080934E015D +:1007D0008091F1018823B9F48091C30183FF37C070 +:1007E0008091F801882399F58091D5018530B9F081 +:1007F000A5EDB1E0E2E5F1E093E08D9181939150B8 +:1008000097FFFBCF1AC08091DA0183FF20C080914F +:10081000F8018823E1F48091EC01853021F480E82F +:100820008093850114C0ACEEB1E0E2E5F1E093E025 +:100830008D918193915097FFFBCF80914E018860FD +:1008400080934E011092F90181E08093F80180912C +:10085000F801813091F48091F901893121F483E02C +:100860008093F8010AC080914E01886080934E0108 +:100870008091F9018F5F8093F9018091FA018823BB +:1008800029F080914E01806880934E019CDE08958E +:100890008091A70181FF17C08091010184FF45C0AD +:1008A00080914D01877F80934D018091A8018093B5 +:1008B00051018091A8018F5F8093A80184DE84E0BC +:1008C0008093A70108958091A70182FF16C08091AF +:1008D000A801809351018091A8018F5F8093A801A6 +:1008E00072DE8091A80184FF20C01092A701809140 +:1008F000860180628093860108958091A70180FF20 +:1009000014C0A2E9B1E0E0E4F1E093E18D91828BC3 +:100910009150319697FFFACF80914D018860809376 +:100920004D0151DE82E08093A7010895299A5A9AD9 +:10093000419A5D9828985C985998549A0895982FF0 +:10094000299A59985C98419834E360FF0BC08091D4 +:100950009101880F80939101309191013167892F26 +:10096000855E0FC0892F845E20EA98E05C9827FF9F +:1009700002C0599A01C05998220F5C9A915097FF72 +:10098000F5CF8068232F3327322F2227280F311DE0 +:100990009FE05C9837FF02C0599A01C05998220F16 +:1009A000331F5C9A915097FFF4CF5C985998419A05 +:1009B00008955D98289829985A9841985C98599874 +:1009C00008951F920F920FB60F9211242F933F9309 +:1009D0004F935F936F937F938F939F93AF93BF9347 +:1009E000CF93EF93FF93C0918801CF5F8C2F99270E +:1009F000AA27BB27FC013197E830F10508F094C124 +:100A0000E65EFF4F09948091860185FF3FC080918B +:100A1000A601E82FFF27EE56FE4F808180938701C5 +:100A20008091A6018F5F8093A6018091A6018431F9 +:100A3000C1F51092A6018091A70185FF12C0809197 +:100A4000BF01E82FFF27EE56FE4F8091C001808343 +:100A50001092A7018091BF01E82FFF27E755FE4FB5 +:100A600010828091BD019091BE0101969093BE01CC +:100A70008093BD018091BD019091BE01885E93403D +:100A800081F41092BE011092BD010BC080918701CC +:100A9000815E8093870180918701853610F01092E6 +:100AA000870161E0809187014ADF80E48093C00084 +:100AB00088E08093C10080918800909189008559D9 +:100AC0009E4F909389008093880080918701809346 +:100AD00048018091860184FDFBDD80914C01845F9B +:100AE0008093890121C18091880090918900805F65 +:100AF0009A4F909389008093880010928A0186E42F +:100B00008093C200289A88E28093C10085E5809393 +:100B1000C6008093C60008C109DF809188009091CB +:100B200089008B5B9F4F49C08091860185FF0DC076 +:100B30008091BD019091BE01892B39F48091A6016D +:100B4000E82FFF27E755FE4F108210928B0110927D +:100B50008C011092900110928D0160E080918701CC +:100B6000EEDE80918800909189008C5E9E4F90937C +:100B70008900809388005498D7C080918800909114 +:100B80008900895A9F4F90938900809388005D9ACD +:100B90008091870180938001C7C010928D011092CF +:100BA000C00080E98093C10086E48093C2008091F8 +:100BB0008800909189008C599B4F90938900809375 +:100BC0008800B2C01092C0001092C1001092C20002 +:100BD000F0DEC0E0809188009091890084559F4F9D +:100BE000909389008093880080918C018F3FE1F57C +:100BF00080918D018823C1F521E02093900188B177 +:100C000098E0892788B9C093FB018091020180FF99 +:100C100005C08091020182FD09C004C080910201DB +:100C200081FD04C08091F701882311F02093F50124 +:100C30008091020183FF0AC08091FA01882361F448 +:100C400081E08093F6018093FA0106C08091FA0159 +:100C5000882311F01092FA018091020187FF22C0CF +:100C600082E08093F8011EC081E08093F7018091BB +:100C7000860184FF0AC08091FB018F5F8093FB0196 +:100C80008091FB018F3F09F45F9A8091860185FF77 +:100C900009C08091A601E82FFF27E755FE4F80810C +:100CA0008F5F80838091860185FF3EC08091A70180 +:100CB0008823B9F58091A601E82FFF27E755FE4F5D +:100CC0008081833070F180914D01886080934D0167 +:100CD0008091A6018093BF018091A60180934F016E +:100CE0008091A601E82FFF27EE56FE4F8081835E9C +:100CF0008093C0018091C0018F3528F08091C001A0 +:100D00008F558093C0018091C001809350018091E4 +:100D1000C0019091A601890F8093510180E18093D9 +:100D2000A70181E08093C101C0938801FF91EF91F9 +:100D3000CF91BF91AF919F918F917F916F915F9173 +:100D40004F913F912F910F900FBE0F901F901895CC +:100D500010928500109284001092800082E08093AF +:100D6000810080936F0086BB0895109285001092D9 +:100D70008400109280001092820082E086BB109264 +:100D80006F0083E0809381000895DEBBDFB7DABD9A +:100D9000CBBDD1E0C0918A01C05CD881D093C600A0 +:100DA000CF53C0938A01C83009F42998D0918901A2 +:100DB000DC1731F4D0E4D093C000D8E4D093C10064 +:100DC000CBB5DAB5DFBFDEB31895DEBBDFB7DABD72 +:100DD000D0E0D093C000D093C100D093C2005A9805 +:100DE00028984198DAB5DFBFDEB318959EBBEABDFF +:100DF000FBBDFFB7F8BD90918C019430B1F0E0E8F5 +:100E0000F1E0E90FF081E091C600FE1771F59395CE +:100E100090938C01943059F5E0918400E0938E0119 +:100E2000E0918500E0938F0122C09091C600F1E02F +:100E3000E0918B019083E395EF73E0938B01F09148 +:100E40008D01F927F0938D01909100019E1779F49F +:100E50009FEF90938C0190E09093C1009093C2001B +:100E60005A985D984198299802C010928C01F8B563 +:100E7000FFBFFBB5EAB59EB31895F999FECFB2BD99 +:0A0E8000A1BDF89A119600B4089580 +:0C0EF000C8030300C9EEFF00CA000000A8 +:00000001FF Added: firmware/hex/tags/0.5.0-libusb/fuxusb.hex =================================================================== --- firmware/hex/tags/0.5.0-libusb/fuxusb.hex (rev 0) +++ firmware/hex/tags/0.5.0-libusb/fuxusb.hex 2008-08-11 13:11:24 UTC (rev 1462) @@ -0,0 +1,496 @@ +:1015B400121786120006300905120F3380F5121631 +:0815C4007C50F012004680EBA0 +:0C178600438F01C281D2A3D2AF020DDB61 +:0C179200C8040500C905B204CA0000002C +:060DDB001218AD43BC80BC +:100DE10090011E1205B60000271043BC1090011E91 +:100DF100E0FCA3E0FDA3E0FEA3E0FFEC4D4E4F605D +:100E010018EF24FFFFEE34FFFEED34FFFDEC34FF5D +:0C0E1100FC90011E1205AA80D453BCEF17 +:100E1D007D80E4FF1218A6E4FF1216E61215FC53AE +:080E2D00F1FC43F101D2B322F4 +:10000600E5BD30E50512176C8012E5BD30E405123A +:10001600185B8008E5BD30E003121852E5BD30E3F9 +:100026000E53BDF71214179000FCE0600214F01294 +:0D0036001325120C9DE5F860031210DC226A +:0414A80041010E00F0 +:100E3500E5CFF0A3E5CFF0A3E5CFF0A3E5CFF02212 +:100E450090010BE4F07412A3F090011074FFF0A36D +:100E55002253CEFB43CE802253CEFD53CE7F22902C +:100E65000110E0FBA3E0FAA3E0F92253CE7F53CEB5 +:100E7500FB2290010BE4F0A322F053CEFB43CE10EE +:080E850022E4F5CF43CE102258 +:1015FC00E4900114F0A3F0A3F090010EF090013AE6 +:06160C00F0900139F0220C +:101159007D857F011218A67F011216E67D817F0227 +:101169001218A67F021216E67D817F031218A67F48 +:10117900031216E67D877F041218A67F041216E66D +:0C1189007D837F051218A67F050216E684 +:0618BB00E4F5C70209BDBF +:1009BD0090010FE5CFF090010DE5CFF090010FE024 +:1009CD005460707390010DE024FEB40A00506690DF +:1009DD0009EA75F003A4C58325F0C58373020A3DAA +:1009ED00020A42020A42020A12020A08020A4202DC +:1009FD000A0D020A17020A27020A38120613806F1F +:100A0D0012150C806A1215CC806590010FE07005EF +:100A1D00121350805A1216F7805590010FE0B481D1 +:100A2D000512182080491217428044120D77803F1D +:100A3D00121612803A803290010FE05460642070DB +:100A4D002890010DE0247E600F14601114601324B2 +:100A5D0003701412152A801712154880121214CA29 +:100A6D00800D1214EB8008800053CEFB1217065335 +:030A7D00CE7F2207 +:1015CC0090011EE5CFF053CEFB43BC011217CE9019 +:0715DC00011EE04480F5C68A +:0115E30022E5 +:10135000AFCF120E70EFD39401501B90010EEFF03F +:10136000B401091213CB12143D1218341217CE1205 +:09137000115943BC0222121706B8 +:011379002251 +:100D770090011E120E35120E70900120E0B4031878 +:100D870090011EE0701290013AF0900139F07F0453 +:100D97001216E67F051216E6900120E0B4010C90CA +:100DA700011EE0B401057F811216E6900120E0B430 +:100DB700020C90011EE0B401057F021216E69001B5 +:100DC70020E0B4050C90011EE0B401057F03121664 +:040DD700E60217CE4B +:10061300C20AAFCFAECFEE24FE60171460292402C6 +:100623006003020703120E457402F0A37465F0021F +:10063300070D90010B7401F07420120E4C7403F03B +:10064300A3743DF002070DEFB40900400302070352 +:1006530090065AF828287302067502068202069449 +:100663000206A10206B30206D00206BF0206E10299 +:1006730006F2120E457402F0A37477F002070D120E +:100683000E77740C120E4D7402F0A37489F00207F6 +:100693000D120E457402F0A37495F002070D120EAD +:1006A30077740C120E4D7402F0A374A7F002070DB9 +:1006B300120E457402F0A374B3F0804E120E7774D9 +:1006C3001E120E4D7402F0A374E7F0803D120E77F4 +:1006D3007422120E4D7402F0A374C5F0802C120E16 +:1006E30077741A120E4D7403F0A37405F0801B1275 +:1006F3000E77741E120E4D7403F0A3741FF0800A5C +:1007030053CEFB12170653CE7F22E5CFE5CF9001E0 +:100713001FE5CFF090011EE5CFF090010BE0FEA3A3 +:10072300E0FF90011EE0FCA3E0FDD39FEC9E400C94 +:10073300EF541F60028001D3920A800890010BECF2 +:10074300F0A3EDF0120E56D390010CE0942090012B +:100753000BE09400400B120E647D2012105740E70B +:1007630022120E6490010BA3E0FD121057502930A2 +:100773000A0A120E64E4FD121057501CE5CE5442CF +:100783007005E5CE30E2F5E5CE20E20CE5CE54422D +:08079300600653CE7F53CEFD3A +:01079B00223B +:10105700900120EDF01216A1900110EBF0A3EAF039 +:10106700A3E9F0900120E0FFC390010CE09FF0900E +:10107700010BE09400F0E5CE54427005E5CE30E078 +:10108700F553CEFEE5CE5442600853CEEF53CEFD66 +:04109700C322D3227B +:10150C00120E5690010EE0F5CF43CE10E5CE30E032 +:0E151C00FB53CEFEE5CE544260FA120E5D2265 +:0A182000120E5612170653CE7F2257 +:100EE300E5CFE5CFAFCF120E5690010FE0247F6020 +:100EF3000C14600E2402701975CF018014E4F5CF31 +:100F0300800FEF547F2413F582E43401F583E0F579 +:100F1300CF120E86E5CE30E0FBE5CE20E2F653CECF +:0F0F2300FEE5CE544260FAE5CE20E2F5120E5DF7 +:010F3200229C +:100FCB0090010FE07002803790010FE0B4010280B6 +:100FDB002E90010FE06402702CE5CF7028E5CFAFA7 +:100FEB00CFEF247F701975C70143CE20E4F5C7906E +:100FFB00011404120E7EE5CE30E0FB53CEFE2253DD +:06100B00CEFB12170622C5 +:100E8D0090010FE07002804790010FE0B4010280E5 +:100E9D003E90010FE06402703CE5CF7038E5CFAFB6 +:100EAD00CFEF601F247F702775C70153CEDF7F0101 +:100EBD001216E6E4F5C7900114120E7EE5CE30E071 +:100ECD00FB8008120E7FE5CE30E0FB53CEFE2253A1 +:060EDD00CEFB12170622F5 +:10152A0090011E120E35120E56120E86E5CE30E0CE +:0D153A00FB53CEFEE5CE544260FA120E5D6A +:011547002281 +:1015480090011E120E35120E56120E86E5CE30E0B0 +:0D155800FB53CEFEE5CE544260FA120E5D4C +:011565002263 +:1014CA0090011E120E35120E5675CF0A43CE10E544 +:1014DA00CE30E0FB53CEFEE5CE544260FA120E5DEA +:0114EA0022DF +:1014EB0090011E120E35120E5675CF0143CE10E52C +:1014FB00CE30E0FB53CEFEE5CE544260FA120E5DC9 +:01150B0022BD +:0C179E00900125120E35120E700217CEBD +:0C17AA00900129120E35120E700217CEAD +:0C17B60090012D120E35120E700217CE9D +:0C17C200900131120E35120E700217CE8D +:0F16F70053CEFBE5CE544260FA53CEFD0217CE20 +:0E174200E5CF90010AE5CFF053CEFB0217CEA3 +:10161200120E5690010AE0F5CF1217CEE5CE5442D3 +:0616220060FA120E5D22C9 +:0F17060043CE20E5CE30E3FB53CEDF53CEF722A8 +:0C17CE0043CE10E5CE30E0FB53CEFE22EF +:100265001201100100000020EB0307FF50000102FE +:100275000301120309040000000000000000000053 +:10028500000000000C034B00790073006F0068004C +:100295001203540075007800440072006F00690075 +:1002A50064000C03310030003000300031001203CF +:1002B500540075007800440072006F006900640006 +:1002C5002203540075007800440072006F00690035 +:1002D50064002D0053007000650061006B0065002F +:1002E50072001E03540075007800440072006F0010 +:1002F500690064002D004D006900630072006F0005 +:100305001A03540075007800440072006F006900FC +:1003150064002D005400540053001E035400750062 +:100325007800440072006F00690064002D004100F0 +:100335007500640069006F00090220010601048050 +:10034500320904000000010100080A2401000134FB +:10035500000201020C240201010200010000000656 +:100365000C24020201010001000005000924030319 +:100375000101000106092403040103000205090423 +:100385000100000102000609040101010102000645 +:10039500072401030102000B2402010101080140A9 +:1003A5001F00090581010800010000072501000063 +:1003B5000000090402000001020005090402010110 +:1003C50001020005072401020102000B24020101BC +:1003D500010801401F00090502010800010000078E +:1003E50025010000000009040300020000000007C9 +:1003F50005840340000107050503400001090404C5 +:1004050000000101000709240100011E0001050C7F +:100415002402070101000100000007092403080167 +:100425000300070709040500000102000709040588 +:10043500010101020007072401070102000B240244 +:100445000101010801401F00090503010800010021 +:08045500000725010000000072 +:0614AC00C106C107C105E5 +:1010DC00E5F830E00BE4F5C7E5CE30E2031218BBBF +:1010EC00E5F830E103121750E5F830E20312163D33 +:1010FC00E5F830E303121628E5F830E40312146225 +:0F110C00E5F830E509300006120C261211CE224C +:10168F0090013AE0600B75C704E5CE20E40343CE2A +:02169F00102217 +:0E13250090010EE06024121733501F20051CAB +:1013330075C70190011E7408F01216678FCF9001D4 +:0C1343001EE014F0E070F243CE10D20562 +:01134F00227B +:0E17500075C701E5CE30E00553CEFEC205227E +:1016280075C70330060B1218EEEF60057F08121518 +:051638006653CEFD2207 +:10163D0075C70220060B1218EEEF60057F08121514 +:05164D006653CEFD22F2 +:1011CE0075C705900139E0FF700CE5CE30E107538D +:1011DE00CEFD7401F022EFB4010EE5CE30E60953D8 +:1011EE00CEBFE4900139F022E5CE30E60453CEBFF7 +:0511FE002253CEFD228A +:1014620075C704E5CE30E01A53CEFE90013AE0147F +:10147200F0E0C394005002E4F090013AE0600343CC +:03148200CE102267 +:0414B20041014100B3 +:10148500EF24FFFFEE34FFFEED34FFFDEC34FFFCEF +:101495000205AAE0FCA3E0FDA3E0FEA3E0FFEC4DFE +:0314A5004E4F2285 +:100C260075C705E5CE5442606D1218EEEF149000BC +:100C3600FBF0AFCFE490011EF09000FBE0FE9001C8 +:100C46001EE0FDC39E501574BB2DF582E43400F5FD +:100C560083E5CFF090011EE004F080DDEF600A240A +:100C6600FE60300470300208F9C200D203E490013D +:100C76001EF090011EE0FF24BBF582E43400F583EC +:100C8600E0FE74182FF8A60690011EE004F0E0B40A +:060C960004E022120BA590 +:010C9C002235 +:100C9D0030076C90013AE0C39402506375C704901D +:100CAD000141E0FF04F08FCF30A3047F0080027F6D +:100CBD00018FCF900116E0F5CFE5106007131354A7 +:100CCD003FFF80027F008FCFE4F517E517C3951026 +:100CDD0050091218158FCF051780F0851017E517DD +:100CED00C3943C5007E4F5CF051780F212183490E9 +:0F0CFD00013AE004F012168FE4900116F0C207DE +:010D0C0022C4 +:1013A30075C70475CFF0EF60047F0080027F018F63 +:1013B300CFAF058FCFAF038FCF900123E0F5CF9051 +:0813C300013AE004F002168F6C +:1008F9009000BBE07001229000BBE0B401209000A1 +:10090900BEE02403600F14600F14600F146003022B +:1009190009A0D207220213CB021203020F82900010 +:10092900BBE0B4020DA3E0600614706BD20622C2CC +:1009390006229000BBE06406705D1218349017928D +:100949001209A19017931209A19017941209A8905E +:1009590017951209A89017961209AF901797E47482 +:100969000193FF1215E49017971209AF9017991286 +:1009790009B690179A1209B690179BE4740193FF70 +:100989001215E490179BE493FF1215E490179DE468 +:1009990093FF1215E4D20722E493FF1215E422E42F +:1009A90093FF1215E422E493FF1215E422E493FF66 +:0409B9001215E4220D +:0A120300E4F5A8F5B175C314C2812B +:10120D0090011F1205B60000271043BC1090011F5E +:10121D00121498600890011F12148580F053BCEFD2 +:0A122D00D2B375A61E75A6E180FE7F +:100F8200E4F5A8F5B175C314D2B3C2817B067D0125 +:0E0F92007F041215817B017DF47F041215810E +:100FA00090011F1205B60000271043BC1090011FCE +:100FB000121498600890011F12148580F053BCEF42 +:0B0FC00012189775A61E75A6E180FEB2 +:0918520053BDFE43BC40C28122DB +:0D176C0053BCBF53BDFE53BDDF53BDF7227C +:09185B0053BDEF1215FC02183414 +:0614B600C181C104C10266 +:0A182A00E490011BF090011AF02277 +:0E175E0012182AD201D291C202C204D2002275 +:10143D0053AFFE43C31043C30253C3F753C3FB4320 +:10144D00C32043C340D2B2D2B4D291D288D2A81213 +:05145D00182AD2002254 +:030003000218E2FE +:0318E200D20432FB +:1000460030B410C204E490011CF012182BC201C295 +:1000560091D202200203020264200403020264E435 +:1000660090011EF0C20490011BE0702C1217245060 +:100076000E900118300304740A80127402800E3048 +:10008600030790011874088004E4900118F0F5C580 +:1000960090011B7401F0805790011BE0B40119A375 +:1000A600E0B4110690011B7402F0900118E030E1F3 +:1000B6003B1216528FC5803790011BE0FF64027019 +:1000C60027A3E0FEB4150F900118E030E302C20347 +:1000D60090011B7403F0900118E030E30974062EBA +:1000E600F8E6F5C580098004EFB40303E4F5C5908E +:1000F600011CE004F090011AE0FF7030AEC4BE802F +:1001060003D38001C350F530A303020264900117A4 +:10011600E5C5F0E5C590011930E7057422F08003C6 +:100126007411F090011A7401F0020252EF6401702A +:100136004AAFC4BF8003D38001C350F530A3030286 +:100146000264900117E030E112D29090011CE02485 +:1001560097F582E43400F583E5C5F0900119E024B3 +:1001660001FFE433FE90011CE06F7001EE600302B4 +:10017600025290011A7402F002025290011AE064CF +:10018600026003020252AFC4BF8003D38001C35092 +:10019600F530A303020264900117E0F930E35790AB +:1001A6000119E0FF2405FDE433FC90011CE0FB7A15 +:1001B60000D39DEC6480F87480985015C3EB9FFFC4 +:1001C600EA9400FE741E2FF58274013EF583E5C5A0 +:1001D600F0900119E02406FFE433FE90011CE0B51F +:1001E6000714E4B50610A3E5C5F0E0FF900116E09C +:1001F600C39F5002EFF0900119E0FF2406FDE4339F +:10020600FC90011CE06D7001EC7041D200C202D27C +:1002160091D201E954826003121237900117E0303F +:10022600E33C900120E06036E490011FF090011F4E +:10023600E02420F582E43401F583E0FF1215E49012 +:10024600011FE004F0E0C3940440E22290011EE0A6 +:0E02560004F0300409E0C39405500302006A6E +:010264002277 +:0414BC004100FD00EE +:1012690074BB2FF582E43400F583E0FF9000FEE0C3 +:10127900FE04F0900104E0FCA3E02EF582E43CF5C5 +:1012890083EFF090011FE004F022E4900123F0FBCA +:011299002232 +:100BA5009000BBE0B4010512111B803120090E1223 +:100BB50012937D01FF1213A312187F80209000BBB2 +:100BC500E0B4030F12187F1212937DFE7F011213FA +:100BD500A3800A9000BBE0B40203120A809000FFD4 +:100BE500E0FF900106E0FEB50725900109E0FD90C4 +:100BF50000FEE0B50519900108E02DF0900107E031 +:100C05003400F0E49000FEF0900106F0D20822EEE8 +:100C1500C39F400C1212937D05FF1213A312187F78 +:010C250022AC +:100F33009000FCE07048300845781E7C017D017B01 +:100F4300017A0179007E007F0612052D9001247439 +:100F530040F01212F9900097E020E0F99000FC7441 +:100F630014F0900097E0C413135401FF9000FDE0C8 +:0F0F730004FDF0E4900123F0FB1213A3C2082247 +:100A8000900106E070779000BCE0900101F0A3E4D3 +:100A9000F09000BDE0FF900102E02FF0900101E036 +:100AA0003400F09000FBE0B404028039900101E0D2 +:100AB000FEA3E0FFEE547FFC900107E06C7003A3FF +:100AC000E06F6024EF64C07003EE641D601A900153 +:100AD00001E0640E7004A3E064C0600C1212937D08 +:100AE00003FF1213A312187F90011F7403F09001EB +:100AF0001FE0FFC39423501A12126980F190011F66 +:100B00007401F090011FE0FFC39421500512126997 +:080B100080F1900106E004F001 +:010B180022BA +:10111B009000FC74FAF01216B31213F19000BCE0BD +:10112B0025E0900100F09000BDE0900109F09000E7 +:10113B00BEE09000FFF0E4900107F0A3F09000FEFA +:0E114B00F0900106F09000FDF0D209C2A8223B +:08187F00C2091213CB02175E2F +:1016B3001218D212189F9001047400F0A37403F05F +:0116C3002204 +:1012F900900097E054BFF090011EE0900098F090A4 +:10130900011FE0FCA3E0FDEC900001F0A3EDF090DB +:0C1319000124E02402900096F002171559 +:1010110090008AE0FF04F0748B2FF582E43400F530 +:1010210083E595F022E0FF04F074012FF582E434AA +:1010310000F58322900096E0FF900000E0C39F221C +:10104100E0FBA3E0FAA3E0F9EA494B22A3E0FAA30B +:06105100E0F5828A832213 +:0418D2007593802268 +:07189F007593C043B1022262 +:0C17DA00900083EBF0A3EAF0A3E9F022FA +:0C17E600900087EBF0A3EAF0A3E9F022EA +:0F171500900097E04401F0E4900000F00218D635 +:0418D60043932022F6 +:0B180A00439310900097E054FEF02282 +:0318E5008F9522BA +:0418DA00439304220E +:0418DE005393FB2203 +:0318E800AF952297 +:0318EB00AF942295 +:0300430002079C15 +:10079C00C0E0C0F0C083C082C0D075D008AF94EF69 +:1007AC001205E708E80008010808011008091808F4 +:1007BC002920080928082930083338083940082925 +:1007CC004808365008265808496008496808497096 +:1007DC00084978085F80087188085F90087198084C +:1007EC0078A008A4A808A4B008CBB80833C0083374 +:1007FC00C8000008EB5393DF900098800812103566 +:10080C00500B121026E0FF1218E50208EB12180A22 +:10081C00900097E04440F00208EB12101190009702 +:10082C00E04402F00208E80208E31210119000867E +:10083C00E014FF90008AE0C39F502780229000971D +:10084C00E04401F090008AE4F0900097E054FBF053 +:10085C000208D912101190008AE0C39408500302C8 +:10086C0008D90208DE900097E04404F012189F901B +:10087C000083121041601890008AE0FF7B017A001F +:10088C00798BC00A90008312104DD00A1206119079 +:10089C000097E054FEF08047900087121041601AD8 +:1008AC007B017A007901C00A90008712104DD00AA2 +:1008BC007F82120611900096EFF0900000E4F09009 +:1008CC000000121026E0F59512103550051218DABA +:1008DC00800D1218DE800812189F800312180A531C +:0D08EC0093F7D0D0D082D083D0F0D0E0328E +:0618C100E4F514F513220A +:0F172400C3E5139514D394204003D38001C3224F +:101566008F17C3E51395146440600FAF130513EF8F +:0A157600543F2422F8A6CFD517E851 +:011580002248 +:10165200E514B513037F8022AF140514EF543F2421 +:0516620022F8E6FF2262 +:0618C700E4F516F5152200 +:0F173300C3E5159516D394204003D38001C3223C +:101237008F17C3E515951664406026E517FDEFC3C4 +:101247009DFDE49400FC74992DF58274003CF583B0 +:10125700E0FEAD150515ED543F2462F8A606D51737 +:01126700D1B5 +:011268002263 +:10166700E516B515037F8022AF160516EF543F2404 +:0516770062F8E6FF220D +:0214C000C10B5E +:0A183400E4F512F511F510C20B22C5 +:1015E400300B03121834AE10051074A22EF8A6079F +:0815F400E510B43C02D20B2209 +:0B181500AF11051174A22FF8E6FF22AE +:0214C200C10C5B +:1016C400E0FEA3E0FFE4FCFDFB7AFAF9F8D302059F +:0116D4009481 +:1013CB00D291C281E4900120F0A3F090012012167B +:1013DB00C44010900121E004F070F0900120E00473 +:0513EB00F080E8D28152 +:0113F00022DA +:1013F100C291C281E490011FF0A3F090011F121667 +:10140100C44010900120E004F070F090011FE0044E +:05141100F080E8D2812B +:0114160022B3 +:10167C0020A304D20CD322300C031213CBD200C201 +:02168C000CC38D +:01168E002239 +:0514C40042013B0000A5 +:1014170030090A7D207C017F007E01801520A30A08 +:101427007D207C007F107E0080087D007C047F008B +:061437007E0312129A224E +:10129A0090013CE004F0700690013BE004F09001FC +:1012AA003BE0FAA3E0FBB50707EAB50603C2B3229F +:1012BA00C3EB9DEA9C4009D2B3E490013BF0A3F052 +:0112CA002201 +:0D177900120553F5CF740129F9E43AFA2264 +:0718A6008FC7AF058FD422AC +:1011950030F805E4F5C7802E30F90575C7018026BE +:1011A50030FA0575C702801E30FB0575C70380162A +:1011B50030FC0575C704800E30FD0575C705800632 +:0911C50030FE0375C706AFC72216 +:0318EE00AFE22244 +:09186400AFE3EFFEADE2EDFF225F +:1016A100E4F5C7AF051DEF600512177980F543CE4C +:0216B100102205 +:0C17F200AF051DEF600512177980F5228D +:1016D500AF051DEF600AE5CF12056C12177E80F08D +:0116E50022E2 +:09186D008FC7E4F5CE43CE202222 +:1016E6007401A807088002C333D8FCF5D5E4F5D504 +:0116F60022D1 +:0718AD0075A41043A3022201 +:0718B4001218AD43BC8022B5 +:10137A0041746D656C202852290A63353133312D49 +:10138A007573622D6364632D315F305F320A0A0020 +:09139A001B631B5B3F32356C0044 +:0B109B00900135EBF0A3EAF0A3E9F0B0 +:1010A600900135E0FBA3E475F00112057EA9F0FA84 +:1010B600120553900138F06013E0B40A057F0D1253 +:1010C6001887900138E0FF12188780D47F0D121818 +:0610D600877F0A02188763 +:091876007BFF7A13799A02109BA2 +:100D0D0090013EEDF090013DEFF070097F0D12184E +:100D1D00877F0A80377F1B1218877F5B1218879099 +:100D2D00013EE0FFD394094003120D6B90013E127A +:100D3D000D5D7F3B12188790013DE0FFD394094074 +:100D4D0003120D6B90013D120D5D7F481218872225 +:100D5D00E075F00A84E5F02430FF12188722EF7554 +:0A0D6D00F00A842430FF12188722D8 +:0518CD00A298920D221B +:10159B00759840538FF7438F0175CBFF75CAF37561 +:0915AB00C834D2CA439812D322BD +:081887003099FDC2998F9922EE +:07188F003098FDAF99C298EB +:01189600222F +:0A183E008FC5E5C430E7FB7F0122EF +:0A18480043A22012FFC053A2DF22CA +:0C17FE008F1CAF058F1F121848AF1D2272 +:10158100A2AF920FC2AF8F1CAF038F1FAF058F1D8C +:09159100121848A20F92AF7F016D +:01159A00222E +:0812CB0090013FEFF0A3EDF0EC +:1012D300A2AF920EC2AFE4FD7F081217FE90013F4A +:1012E300E0F45FFFA3E04FF51D751C07121848A239 +:0512F3000E92AF7F0127 +:0112F80022D3 +:08189700C2AF43A22002F400DD +:03000000020B19D7 +:0C0B1900787FE4F6D8FD7581DD020B60EA +:10045D00E709F608DFFA8046E709F208DFFA803E81 +:10046D0088828C83E709F0A3DFFA8032E309F6086E +:10047D00DFFA8078E309F208DFFA807088828C83D6 +:10048D00E309F0A3DFFA806489828A83E0A3F6088A +:10049D00DFFA805889828A83E0A3F208DFFA804C64 +:1004AD0080D280FA80C680D4806980F2803380103B +:1004BD0080A680EA809A80A880DA80E280CA8033A4 +:1004CD0089828A83ECFAE493A3C8C582C8CCC5831C +:1004DD00CCF0A3C8C582C8CCC583CCDFE9DEE780EC +:1004ED000D89828A83E493A3F608DFF9ECFAA9F06B +:1004FD00EDFB2289828A83ECFAE0A3C8C582C8CCC1 +:10050D00C583CCF0A3C8C582C8CCC583CCDFEADED9 +:10051D00E880DB89828A83E493A3F208DFF980CC3B +:10052D0088F0EF60010E4E60C388F0ED2402B40434 +:10053D000050B9F582EB2402B4040050AF232345DB +:06054D0082239004AD734F +:10055300BB010689828A83E0225002E722BBFE02A6 +:09056300E32289828A83E49322D9 +:10056C00BB010689828A83F0225002F722BBFE016E +:02057C00F32268 +:10057E00A3F8E0C5F025F0F0E58215827002158330 +:06058E00E0C838F0E8228D +:10059400EB9FF5F0EA9E42F0E99D42F0EC6480C8DE +:0605A40064809845F0227E +:0C05AA00ECF0A3EDF0A3EEF0A3EFF022C4 +:1005B600A8828583F0D083D0821205CD1205CD1294 +:1005C60005CD1205CDE473E493A3C583C5F0C583B9 +:1005D600C8C582C8F0A3C583C5F0C583C8C582C88F +:0105E60022F2 +:1005E700D083D082F8E4937012740193700DA3A3A3 +:1005F70093F8740193F5828883E4737402936860B7 +:06060700EFA3A3A380DFB6 +:06060D008A838982E47378 +:100B25000215B4E493A3F8E493A34003F68001F21D +:100B350008DFF48029E493A3F85407240CC8C333D1 +:100B4500C4540F4420C8834004F456800146F6DFA0 +:100B5500E4800B01020408102040809014A8E47E74 +:100B6500019360BCA3FF543F30E509541FFEE49395 +:100B7500A360010ECF54C025E060A840B8E493A35C +:100B8500FAE493A3F8E493A3C8C582C8CAC583CA87 +:100B9500F0A3C8C582C8CAC583CADFE9DEE780BE3F +:0114C9000022 +:00000001FF Added: firmware/hex/tags/0.5.0-libusb/info.xml =================================================================== --- firmware/hex/tags/0.5.0-libusb/info.xml (rev 0) +++ firmware/hex/tags/0.5.0-libusb/info.xml 2008-08-11 13:11:24 UTC (rev 1462) @@ -0,0 +1,73 @@ +<?xml version="1.0" ?> +<root> + <version tuxdroid_firmware_version="0.5.0-libusb"> + <tux_core> + 0.5.0 + </tux_core> + <tux_audio> + 0.5.0 + </tux_audio> + <fux_rf> + 0.3.0 + </fux_rf> + <tux_rf> + 0.3.0 + </tux_rf> + <fux_usb> + 0.5.0-libusb + </fux_usb> + </version> + <description> +Refactoring of the inter-MCU communication (I2C and USB). No major functionalities have changed but stability should be greatly improved. +This USB firmware has been compiled as libusb and is compatible with the tuxd daemon included in tuxsetup-1.3-rc2 or below. The firware will soon be compiled as an HID device and tuxd will be updated accordingly. + </description> + <changes> + <tux_core> + * Refactoring of the I2C communication between tuxcore and tuxaudio. Multi- + master has been dropped in favor of a master-slave communication. + Communications should now be more reliable. + + * Moved the pong function so that they are sent as fast as possible, not one + every 100ms anymore. This should point more communication problems in this + worst case. + + * Added motor states in the status. + </tux_core> + <tux_audio> + * Refactoring of the I2C communication between tuxcore and tuxaudio. Multi- + master has been dropped in favor of a master-slave communication. + Communications should now be more reliable. + + * Added 2 modules: parser and misc. The parser functions spread in main.c and + communication.c are now merged into one function in parser.c. All commands + coming from the RF and tuxcore will be parsed by the same function. + + * All fifo now use the fifo module. + + * Power saving for sleep added in the flash module. + + * Simpler audio stack adaptation. + + * Bug fixes (specially in the flash module) and cleanup. + </tux_audio> + <fux_rf> + Initial release. + </fux_rf> + <tux_rf> + Initial release. + </tux_rf> + <fux_usb> + * Major cleanup of the USB code, finally up-to-date on SVN. + + * Lots of bug fixes. + + * Can be compiled in HID or libusb mode. + + * Improved the bootloader mode. + + * Added doxygen documentation. + + * Versioning is available through dongle commands and not standard commands. + </fux_usb> + </changes> +</root> Property changes on: firmware/hex/tags/0.5.0-libusb/info.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Id Name: svn:eol-style + native Added: firmware/hex/tags/0.5.0-libusb/tuxaudio.eep =================================================================== --- firmware/hex/tags/0.5.0-libusb/tuxaudio.eep (rev 0) +++ firmware/hex/tags/0.5.0-libusb/tuxaudio.eep 2008-08-11 13:11:24 UTC (rev 1462) @@ -0,0 +1,2 @@ +:0100000000FF +:00000001FF Added: firmware/hex/tags/0.5.0-libusb/tuxaudio.hex =================================================================== --- firmware/hex/tags/0.5.0-libusb/tuxaudio.hex (rev 0) +++ firmware/hex/tags/0.5.0-libusb/tuxaudio.hex 2008-08-11 13:11:24 UTC (rev 1462) @@ -0,0 +1,391 @@ +:1000000019C0ABC0B9C031C09EC02FC02EC02DC01A +:100010002CC02BC02AC029C028C027C026C025C09C +:10002000BAC023C022C021C020C01FC01EC01DC036 +:1000300082CA1BC011241FBECFEFD4E0DEBFCDBFEC +:1000400011E0A0E0B1E0EAEFF7E102C005900D9207 +:10005000AE34B107D9F712E0AEE4B1E001C01D92B1 +:10006000A139B107E1F751D1C7CBCACFCF93DF9305 +:10007000CDB7DEB721970FB6F894DEBF0FBECDBF68 +:100080008FEA84B987EC85B98FE088B988E087B9B1 +:10009000198203C089818F5F898389818233D0F37C +:1000A00017B883ED8BB981EE8AB983E284BD89E00C +:1000B00085BD16BC8AEF87BD18BC109280001092D7 +:1000C0008100109285001092840010928700109297 +:1000D0008600109289001092880010928B00109276 +:1000E0008A001092B6001092B0001092B1001092E7 +:1000F000B2001092B3001092B40081E080936E00C1 +:1001000010926F001092700080E880BF10927B0008 +:1001100010927E0086E080937C0086E880937A00CF +:1001200080E58CBD1DBC8EB589838FE0809369000E +:1001300083E08CBB21960FB6F894DEBF0FBECDBF17 +:10014000DF91CF9108951F920F920FB60F92112455 +:100150000F900FBE0F901F9018951F920F920FB621 +:100160000F9211248F9381E0809350018F910F9013 +:100170000FBE0F901F9018951F920F920FB60F92FF +:1001800011248F9381E080934F018F910F900FBEC8 +:100190000F901F9018951F920F920FB60F92112477 +:1001A0002F933F934F935F936F937F938F939F937F +:1001B000AF93BF93EF93FF9380917A008064809315 +:1001C0007A0080910001815080930001882369F5B5 +:1001D00084E08093000160917800669580917900B9 +:1001E00080FF606880910E0190910F0112D168E448 +:1001F00070E080910701909108012AD190917E01D1 +:10020000882329F4992339F05F9A559A04C09923D9 +:1002100011F05F98559880919301815080939301DC +:10022000882319F481E080939201FF91EF91BF91AF +:10023000AF919F918F917F916F915F914F913F917E +:100240002F910F900FBE0F901F901895CF93DF93B3 +:10025000CDB7DEB724970FB6F894DEBF0FBECDBF83 +:1002600080EF898396B189B19F70807D982B9A83A6 +:100270001E9B02C090629A838A819BE989278A83A8 +:10028000809157028B83882321F480915A0188231F +:1002900019F081E08C8301C01C82CE01019653D6F7 +:1002A00024960FB6F894DEBF0FBECDBFDF91CF917D +:1002B000089510924E01A2D1F89480E885B998E093 +:1002C00098B91BB8E4E6F0E0208189EE8083909332 +:1002D0006C0082E08BBBE8E6F0E080818260808386 +:1002E00083B7817F846083BF83B7816083BF789445 +:1002F000889583B78E7F83BF10926C002093640033 +:10030000B5DE56D546D574D10895CEEFD4E0DEBF24 +:10031000CDBFACDE809107019091080169D080913A +:100320000E0190910F0164D041DAFDD28093150245 +:1003300080911502BBD280935B012BD58AE090E0BF +:10034000909359018093580178941E99FECF83E0D1 +:100350008CBB8DBB789408D780915101882351F0D4 +:100360001092510188E891E03AD6882319F488E880 +:1003700091E0E9D580915301811102D3809154011C +:1003800081114ED180915201811157D26CD580914B +:100390009201882331F11092920180914E018230B6 +:1003A00020F0815080934E0101C050DF90911001E8 +:1003B0009923B9F08AB183608AB9198203C089810F +:1003C0008F5F898389818F3FD1F7892F81508093F7 +:1003D0001001882319F48AB1836002C08AB18C7F2E +:1003E0008AB980914E01813009F0B4CF62DFB2CF7B +:1003F000FC01138214820895FC0120E030E0838127 +:100400009481891B9281891711F421E030E0C901A0 +:100410000895DC01FC01238192818481F22FF81B75 +:10042000F91719F481E090E00895E22FFF27892F52 +:1004300099270197E823F9238D919C911197E80F53 +:10044000F91F60832F5FFD01238380E090E0089512 +:10045000CF93DF93DC01EC012C818B81281719F4F9 +:1004600082E090E013C0E22FFF27ED018A819927F7 +:100470000197E823F9238D919C91E80FF91F808162 +:10048000FB0180832F5F2C8380E090E0DF91CF9190 +:1004900008958EBD0DB407FEFDCF8EB59927089542 +:1004A000FF920F931F93182F062FF42E299883E0A5 +:1004B000F0DF812FEEDF802FECDF8F2DEADF80E091 +:1004C000E8DF299A99271F910F91FF900895FF92D5 +:1004D0000F931F93182F062FF42E299889E3D9DF45 +:1004E000812FD7DF802FD5DF8F2DD3DF299A1F9162 +:1004F0000F91FF9008951F93182F299881E0C9DF6D +:10050000812FC7DF299A1F910895299884E0C1DFC0 +:10051000299A0895299886E0BCDF299A0895CF93F7 +:10052000DF9380E0E8DFC1E1D1E0F4DF4A81698157 +:100530008881CDDF239681E0C233D807B1F7DF9100 +:10054000CF910895ECDFE6DF299880E6A2DF299AB3 +:100550000895299885E09DDF80E09BDF299A9927FF +:100560000895EF92FF920F931F93182F062FD7DF56 +:10057000E02EE11AFF24102F1295107F13C0CADF5E +:10058000299880E286DF802F82958F7082DF812F0D +:1005900080DF80E07EDF299ADCDF80FDFDCF015027 +:1005A0001051FA948E2D8095F81649F71F910F91EE +:1005B000FF90EF900895EF92FF920F931F93182FE3 +:1005C000062FF42EE22EC5DF80FDFDCFA3DF299894 +:1005D00082E05FDF812F5DDF802F5BDF8F2D59DFB2 +:1005E0008E2D57DF299A1F910F91FF90EF9008955C +:1005F000289A29988BEA4DDF299A0895289A2998F4 +:1006000089EB47DF299A08951092570210925401FE +:1006100020E040E060E08CEC79D4289A299A089593 +:100620001F93CF93DF9380916002882309F4F5C074 +:100630001091570280911502882309F48DC011236F +:1006400009F48AC080911502811708F485C081E001 +:1006500080936101109263018093620120E090E039 +:10066000312F315002C02F5F9F5F931741F08F3FB2 +:1006700011F08E3F09F42F5F8D5FA9F3F5CF892F1D +:10068000880F890F8F5F20936301809362019F5FC2 +:1006900090936101299883E0FCDE80E0FADE80918E +:1006A0006301F7DE80916201F4DECFE7D1E080E004 +:1006B000F0DE899381E0C538D807C9F71230A8F079 +:1006C00080918001805F8093800180918001807F94 +:1006D0008093800180918001882329F480917F019B +:1006E0008F5F80937F0110928101299A80917F0111 +:1006F000883090F580918201883070F580917F017B +:10070000882321F480918001843030F1809183012D +:10071000882321F4809184018430F0F0909182014B +:1007200080917F019817C0F09091820180917F01A4 +:100730009817B9F49091830180918001981760F027 +:100740009091830180918001981759F490918401D0 +:1007500080918101891728F010925401109257025C +:1007600068C0809107019091080142DE299883E0DA +:1007700090DE80917F018DDE809180018ADE809104 +:10078000810187DE8AEF87BD1092600260911502B9 +:1007900020E040E08CECBAD34CC036DF4AC080E0A9 +:1007A00078DE20918701992702C0959587952A9533 +:1007B000E2F7682F80910701909108012ADE80916D +:1007C00081018F5F8093810180918101882391F461 +:1007D000809180018F5F80938001809180018823C8 +:1007E00049F480917F018F5F80937F0180917F0129 +:1007F000883099F290917F0180918201981769F475 +:100800009091800180918301981739F49091810132 +:1008100080918401981709F4C0CF809150018823FA +:1008200041F48091070190910801E6DD882309F4E5 +:10083000B6CFDF91CF911F9108951F938091320120 +:10084000882321F07FDE109232012EC082DE80FDEF +:100850002BC011E010933201109252012EEF40E0B4 +:1008600060E080E0A8DE20E041E060E080E0A3DE20 +:1008700024E042E060E080E09EDE20E043E060E0D3 +:1008800080E099DE1092150210925B0120E040E0BA +:1008900060E08DEC3BD36091150220E040915B015C +:1008A0008BEC34D310936E001F9108954091150284 +:1008B00083E0489FA00111244F5F5F4F5093600178 +:1008C00040935F01652F772780E0EADD80937F0109 +:1008D00040915F01509160014F5F5F4F5093600105 +:1008E00040935F01652F772780E0DADD80938001F8 +:1008F00040915F01509160014F5F5F4F50936001E5 +:1009000040935F01652F772780E0CADD80938101E6 +:1009100080917F01909180018295807F92959F7058 +:10092000890F9927089581E08093620110926301F5 +:1009300010926101409162016091630180E0B0DD3D +:100940008F3FB9F08091630120916201922F9F5FE8 +:1009500021F09F5F11F09F3F09F48F5F8093630147 +:100960002D5F20936201809161018F5F809361010F +:10097000E1CF8091610181508093610199270895B1 +:10098000FF920F931F93CF93DF93CDB7DEB72197DD +:100990000FB6F894DEBF0FBECDBF80915E018823F5 +:1009A00009F08AC010926E0080911502882351F4DC +:1009B00010927F0184E08093800110928101109257 +:1009C000640152C04091150283E0489FA0011124A8 +:1009D0004F5F5F4F5093600140935F01652F772712 +:1009E00080E05EDD80937F0140915F015091600166 +:1009F0004F5F5F4F5093600140935F01652F7727F2 +:100A000080E04EDD8093800140915F015091600154 +:100A10004F5F5F4F5093600140935F01652F7727D1 +:100A200080E03EDD8093810180918001805F809332 +:100A3000800180918001807F80938001809180017E +:100A4000882329F480917F018F5F80937F0110922A +:100A5000810190917F01809180019295907F829594 +:100A60008F70980F90936401809107019091080115 +:100A7000BFDC80917F01883048F085E080935E0183 +:100A800020E040E065E08DEC41D205C080915E0140 +:100A90008F5F80935E0188E893E190935701809384 +:100AA0005601909359018093580120918001409103 +:100AB0007F0161E08DEC4FC1813051F5F0908101F3 +:100AC0000091800110917F0125DD29988FEAE1DCFA +:100AD000812FDFDC802FDDDC8F2DDBDCBE016F5F43 +:100AE0007F4F8091070190910801B2DC882311F4B7 +:100AF000898101C080E8CDDC299A80915E018F5FF9 +:100B000080935E0181E08093600210925D0124C1B8 +:100B1000823009F07EC080916002882309F052C0C3 +:100B200057C0E0910701F0910801938184819817E3 +:100B3000A9F181E080935D018AE090E090935701F4 +:100B400080935601909359018093580129988FEA18 +:100B5000A0DCBE016F5F7F4F80910701909108017B +:100B600077DC898196DC299A809181018F5F80935F +:100B7000810180918101882371F4809180018F5FD0 +:100B80008093800180918001882329F480917F01E6 +:100B90008F5F80937F01DDDC80FDFDCF809156016A +:100BA00090915701892B09F4B6C080917F0187305D +:100BB00049F4809180018F3F29F4809181018F3F1A +:100BC00009F4A9C080915001882309F4AACFC4C0B8 +:100BD0009CDC80915D01882399F040917F01809198 +:100BE00080014295407F82958F70480F40935B0152 +:100BF00080916401481B20E062E08DEC87D187C0C2 +:100C000020E040E066E08DEC81D185E080935E01DC +:100C1000A3C0833091F580915C01813011F484E0B0 +:100C200027C0823039F520E040E064E08DEC6ED1E1 +:100C300090916401992371F481E0809352018AE0DC +:100C400090E0909359018093580110925E011092A8 +:100C5000530110C060917F01809180016295607F97 +:100C600082958F70680F60935B01892F7ADC85E035 +:100C700080935E0110925C016FC0843009F04EC019 +:100C800020E040E063E08DEC41D1809115028F5F60 +:100C9000809315024091150283E0489FA001112422 +:100CA0004F5F5F4F5093600140935F0120917F0140 +:100CB000652F772780E07FDC40915F0150916001D4 +:100CC0004F5F5F4F5093600140935F01209180011F +:100CD000652F772780E06FDC40915F0150916001C4 +:100CE0004F5F5F4F5093600140935F0120918101FE +:100CF000652F772780E05FDC90917F0180918001F4 +:100D00009295907F82958F70980F90935B01809160 +:100D10005E018F5F7BCF109260021EC08530E1F4D0 +:100D200002DE809315028AE090E09093590180934F +:100D3000580110925E011092530181E080936E0081 +:100D400020E040E060E08DECE1D06091150220E011 +:100D500040915B018BECDAD021960FB6F894DEBFA0 +:100D60000FBECDBFDF91CF911F910F91FF900895DE +:100D7000FC018181843061F4A281B3818C9188234C +:100D800039F080818A3221F4B0936601A093650125 +:100D9000089549D39AE29093410184E080934201FF +:100DA000909347018093480188EB96E032D30895F1 +:100DB00080913801909139011BDB08950F931F93A7 +:100DC000CF93DF93BC01E0913F01F091400193810B +:100DD0008481981729F401C0789481E090E014C0D0 +:100DE000F894EB018B010C5F1F4FBE0180913F0116 +:100DF000909140012DDB882379F72196C017D10708 +:100E0000A1F7789480E090E0DF91CF911F910F914E +:100E10000895FF920F931F93CF93DF939C01E0916E +:100E20003F01F091400183819481891B8D3118F03D +:100E300080E090E012C0FFB6F894E90189010C5FF0 +:100E40001F4F699180913F0190914001E2DAC017F4 +:100E5000D107B9F7FFBE81E090E0DF91CF911F91FC +:100E60000F91FF900895CF93DF931E9905C0809155 +:100E70003F0190914001BCDA10D3019709F443C0BF +:100E80008091450190914601039749F18091650158 +:100E900090916601009761F0A2D0882329F4809197 +:100EA000650190916601B5DF1092660110926501AF +:100EB000E0913801F0913901938184819817D1F044 +:100EC000C7E6D1E0BE018091380190913901C0DAC6 +:100ED0008823C9F4219681E0CB36D80799F781E4BD +:100EE00091E0E9D210C0D9D2019769F087E491E08E +:100EF000AAD209C0E0913F01F09140018381948121 +:100F0000891B8D3180F3DF91CF910895CF93DF93CB +:100F1000CDB7DEB724970FB6F894DEBF0FBECDBFB6 +:100F200089836A834B832C83CE01019672DF9927D4 +:100F300087FD909524960FB6F894DEBF0FBECDBF07 +:100F4000DF91CF910895FF920F931F93CF93DF937B +:100F5000AC01E0913801F091390123818481281B93 +:100F60003327828199270497821793071CF480E026 +:100F700090E012C0FFB6F894EA018A010C5F1F4F9F +:100F80006991809138019091390143DAC017D107F6 +:100F9000B9F7FFBE81E090E0DF91CF911F910F91F3 +:100FA000FF900895CF93DF93CDB7DEB724970FB6A8 +:100FB000F894DEBF0FBECDBF89836A834B832C8339 +:100FC000CE010196C0DF992787FD909524960FB634 +:100FD000F894DEBF0FBECDBFDF91CF910895FC0125 +:100FE0008081882309F468C0833011F468D041C03F +:100FF0008039B1F480915401882309F05DC080915B +:101000005301882309F058C0828180938701818130 +:101010008093570281E0809354018093600229C03D +:10102000823949F48181882319F05F98559821C04D +:101030005F9A559A1EC0823561F4809154018823CD +:1010400011F01092540181E080936002809353016B +:1010500010C0843521F481E0809352010AC08335A9 +:1010600059F48181882311F081E001C082E08093EE +:101070005C0181E090E008958F3FD9F48091700188 +:101080009181282F2150209370013181891728F4F4 +:101090003093700110926F0109C0231B80916F0182 +:1010A000820F80936F0181818093700180916F0125 +:1010B000828380E090E0089581E090E00895CF93EE +:1010C000DF93CDB7DEB72C970FB6F894DEBF0FBE17 +:1010D000CDBF80EF9DE1DE011196FC010196E49108 +:1010E000ED932DE18C3F9207C1F7CE01019691DE81 +:1010F000CE0105968EDECE0109968BDE609115023B +:1011000020E040915B018BEC01DF2C960FB6F89448 +:10111000DEBF0FBECDBFDF91CF910895E0910701F3 +:10112000F091080123819481809172018F5F8093F7 +:1011300072018823C1F4291B8091710120937101F0 +:10114000281748F0293278F087B5813F60F087B5DD +:10115000815087BD0895203530F487B58E3F18F44F +:1011600087B58F5F87BD0895CF93DF93CDB7DEB787 +:1011700021970FB6F894DEBF0FBECDBF809150010E +:10118000882309F43DC11092500110925802109228 +:10119000910110929001109286011092850180E5D4 +:1011A0008CBD1DBC0DB40EB428982A9880914F01B7 +:1011B0008823E1F310924F01809190019091910169 +:1011C000892BA9F5E0910E01F0910F0183819481A3 +:1011D000891B813120F082E080938E0102C0109241 +:1011E0008E0180915E02833099F0803889F08130E1 +:1011F00031F089E592E0E2DD882379F409C080913D +:1012000073018F5F80937301843139F410927301FD +:1012100080918E01886080938E0180918E018EBDB9 +:1012200081E090E0909391018093900144C080917F +:101230009001909191010197D9F4809158028131E8 +:1012400031F482E090E0909391018093900180913D +:101250008E0181FF2FC0F894BE016F5F7F4F809198 +:101260000E0190910F01F4D889818EBD789423C02E +:1012700080919001909191010297B1F48091580270 +:10128000853131F483E090E0909391018093900157 +:1012900080918E0183FF0EC0E0915802FF27E95B29 +:1012A000FD4F80818EBD07C080919001909191018A +:1012B000039709F41EBC0DB407FEFDCF80915802C0 +:1012C0008F5F809358028091850190918601892BD0 +:1012D000C1F58EB5809394018091940183FF03C082 +:1012E00081E0809351018091940187FF02C082E2E6 +:1012F00001C081E18093160280919401883021F031 +:1013000080919401882359F480915601909157015E +:10131000009711F001970AC010925A010BC081E0AA +:1013200080935A01809158019091590190935701EF +:101330008093560181E090E090938601809385012F +:1013400035CF8091850190918601019729F5809193 +:10135000940181FF0AC080915401882331F46EB555 +:10136000809107019091080154D8209158028091F2 +:1013700016023327992701962817390709F016CF47 +:1013800082E090E0909386018093850180919401A2 +:1013900081FF0CCFC3DE0ACF809185019091860139 +:1013A000029709F003CF8091940183FF12C08091CE +:1013B000940187FF07C0E09158028EB5FF27EC59D2 +:1013C000FE4F06C0E09158028EB5FF27EB58FE4F46 +:1013D0008083209158028091160233279927069620 +:1013E0002817390709F0E2CE80918E0183FF02C0F1 +:1013F00081E002C080918C0180935E022A9A289A33 +:1014000021960FB6F894DEBF0FBECDBFDF91CF910E +:10141000089590937B0180937A01089590937D01C4 +:1014200080937C0108951092750110927401459A81 +:10143000449A80E68093B90080E28093B80085E802 +:101440008093BC000895FC01809174019091750116 +:10145000019719F48FEF90E00895F0937701E093EE +:10146000760181E090E090937501809374019583FB +:1014700084838081880F8F5F809378011092790137 +:1014800085EA8093BC0080E090E00895E0917601C9 +:10149000F09177018081992708958091740190914E +:1014A000750108951092750110927401089580914C +:1014B000790199270895FC0180917401909175013B +:1014C000019719F48FEF9FEF0895F0937701E09360 +:1014D000760181E090E0909375018093740195838B +:1014E00084838081880F809378011092790185EA46 +:1014F0008093BC0080E090E00895CF93DF93CDB758 +:10150000DEB721970FB6F894DEBF0FBECDBF1982AC +:1015100003C089818F5F898389818F3FD1F785EAF5 +:101520008093BC0021960FB6F894DEBF0FBECDBFEE +:10153000DF91CF9108951F920F920FB60F92112451 +:101540002F933F934F935F936F937F938F939F93CB +:10155000AF93BF93CF93DF93EF93FF938091B90045 +:101560009927887F90708035910509F4A2C0813554 +:10157000910594F58032910509F4DDC08132910521 +:101580009CF48830910509F45CC08930910524F4FD +:10159000892B09F4EDC0EFC08031910509F451C0E9 +:1015A000489709F0E8C052C08833910509F46FC02C +:1015B0008933910544F48832910509F447C0C097F6 +:1015C00009F0D9C0B8C08034910509F483C08834CB +:1015D000910509F0D0C0AFC08837910509F4B8C0B3 +:1015E00089379105ACF48036910509F4B1C0813694 +:1015F00091052CF48835910509F0BDC07AC0883674 +:10160000910509F4A5C08037910509F0B4C0A0C0C8 +:101610008039910509F4A2C0813991054CF48038D4 +:10162000910509F49BC08838910509F0A4C09CC0BD +:101630008839910509F498C0803A910509F09BC05A +:101640008FC0809178018093BB0051C09091790147 +:10165000E0917601F09177018181981770F4809183 +:1016600079010280F381E02DE80FF11D90818F5FF9 +:10167000809379019093BB003AC085E98093BC00C8 +:1016800082E090E090937501809374010FC0809187 +:10169000BC0085688093BC0085E090E09093750164 +:1016A00080937401E0917601F091770195838483B2 +:1016B00062C090917901E0917601F091770102800A +:1016C000F381E02DE90FF11D8091BB0080839F5FC6 +:1016D00090937901209179013327E0917601F0917F +:1016E000770181819927019728173907BCF185E88F +:1016F00040C0A0917601B091770190917901ED0100 +:10170000EA81FB81E90FF11D8091BB0080839F5F1F +:101710009093790184E090E0909375018093740137 +:101720009D838C83E0917A01F0917B01309719F1D0 +:10173000CD0109951DC083E090E0909375018093E1 +:101740007401E0917601F09177019583848310C054 +:1017500081E090E0909375018093740185EC09C05D +:1017600010927501109274018091BC00856801C0CF +:1017700085E98093BC00FF91EF91DF91CF91BF91FC +:10178000AF919F918F917F916F915F914F913F9119 +:101790002F910F900FBE0F901F90189581E0EEE7EC +:1017A000F1E0A0E0B0E0182E0ED0089581E0EEE761 +:1017B000F1E0A0E0B0E0182E01D0089509D0019228 +:1017C0001A94E1F7089501900BD01A94E1F7089567 +:1017D000F999FECFB2BDA1BDF89A119600B4089553 +:1017E000F999FECFB2BDA1BD00BC11960FB6F89419 +:0A17F000FA9AF99A0FBE0895FFCF90 +:1017FA00040195018000000201170240000009015E +:10180A0014000000010000020000030000040000B0 +:10181A0005000006000007000007800007A0000777 +:10182A00C000016102100000330171022000003A79 +:0E183A000100006701000000006B01000000CB +:0C1DF000C8010500C9B20504CA000000CB +:00000001FF Added: firmware/hex/tags/0.5.0-libusb/tuxcore.eep =================================================================== --- firmware/hex/tags/0.5.0-libusb/tuxcore.eep (rev 0) +++ firmware/hex/tags/0.5.0-libusb/tuxcore.eep 2008-08-11 13:11:24 UTC (rev 1462) @@ -0,0 +1,16 @@ +:100000001831331A00144102000012900400000A53 +:100010001B350000003E020000FF00000000000051 +:100020009A021E00FF000000000000000000000017 +:100030009A021E00FF000000000000000000000007 +:100040009A021E00FF0000000000000000000000F7 +:1000500041020000009A0432000090030000FF03F8 +:10006000900200000041020000FF00000000000AB2 +:1000700038900100FF0000000000000000000000B8 +:1000800033900500FF0000000000000000000000A9 +:100090001A000000FF000000000000000000000047 +:1000A0001B000000FF000000000000000000000531 +:1000B000900600000541020000FF00000000000A59 +:1000C000900700000A410200000A80020500FF0AB2 +:1000D000900800000A410200000080020500FF01B4 +:0200E00001001D +:00000001FF Added: firmware/hex/tags/0.5.0-libusb/tuxcore.hex =================================================================== --- firmware/hex/tags/0.5.0-libusb/tuxcore.hex (rev 0) +++ firmware/hex/tags/0.5.0-libusb/tuxcore.hex 2008-08-11 13:11:24 UTC (rev 1462) @@ -0,0 +1,456 @@ +:1000000019C00BC90AC406C399C4B6C22EC02EC0FB +:100010002CC02BC02AC021C52BC50CC553C925C077 +:1000200024C023C022C021C020C093C11EC01DC057 +:10003000DCC71BC011241FBECFEFD4E0DEBFCDBF95 +:1000400011E0A0E0B1E0E6E1FCE102C005900D9214 +:10005000AC33B107D9F711E0ACE3B1E001C01D92B8 +:10006000A33EB107E1F732D0D5CDCACF1F920F9290 +:100070000FB60F9211248F939F9380913F018F5F52 +:1000800080933F0191E090933C01893179F4109283 +:100090003F0190933D01809140018F5F809340012B +:1000A0008A3021F41092400190933E019F918F91EC +:1000B0000F900FBE0F901F901895269A87B18C60F5 +:1000C00087B92F9A87E08BBB78940895CFEFD4E05F +:1000D000DEBFCDBFD9D1FBD982E08093B00096E0DE +:1000E0009093B1001092B2009DE79093B30080937B +:1000F0007000E3DF5DD1B8DB82D4F6D5FBD9809107 +:100100003C018823A9F010923C01B2D380916C018C +:10011000811153D180917801882319F08150809307 +:10012000780190E080910F01811191E0892F7FD5B6 +:1001300080913D01882371F010923D0191E09093F0 +:1001400076018091DA01882329F081508093DA01C9 +:100150009093D90180913E01882311F010923E01C5 +:1001600080917601882309F483C080910D019091DC +:100170000E01892B09F07CC0109276012091670155 +:100180004091660160915A0181EC05D629B146B1D2 +:1001900063B180EC00D62091710140916F016091B4 +:1001A0006D0183ECF8D52091650140916401609167 +:1001B000730184ECF0D5809180018823F1F01092D6 +:1001C000800180912101880F880F880F20912001E4 +:1001D000220F220F282B90911401990F8091130167 +:1001E000982B80910F018295807F892B282B40913D +:1001F0001F01609112018EECCED580916B0180FFC2 +:100200000BC08E7F80936B0120915F0140915D0157 +:1002100060915E0182ECBFD580916B0181FF0BC0C4 +:100220008D7F80936B01209162014091600160910C +:10023000610187ECB0D540916A01442349F04150F7 +:1002400040936A01209163016091630185ECA3D51D +:1002500040917B0150917C014115510521F020E036 +:1002600060E089EF98D580916C01816080936C018A +:1002700080917501882361F029D5882349F0609128 +:10028000750161506093750120E040E08FEF83D5E8 +:10029000C3DAD9DB80910D0190910E01029709F02C +:1002A0002ECF8091DA01882309F029CFF89410929B +:1002B00068001DBA10927A00ABD30ED977D00FD157 +:1002C00023D27FD1E1D19091640089EE80936400C4 +:1002D00080E280936B0081E08BBB8091680081603D +:1002E0008093680083B7817F846083BF83B7816018 +:1002F00083BF7894889583B78E7F83BF9093640083 +:10030000F3D4C2D0DADE54D083E090E090930E01B3 +:1003100080930D0182E08093DA01F1CE9093420147 +:100320008093410108958FE880937A000895109298 +:100330007A00089580937C00EAE7F0E08081806491 +:100340008083089520917800822F20917900922F48 +:1003500008951F920F920FB60F9211242F933F937F +:100360004F935F936F937F938F939F93AF93BF93BD +:10037000EF93FF93E0914101F09142010995FF91C4 +:10038000EF91BF91AF919F918F917F916F915F910D +:100390004F913F912F910F900FBE0F901F90189586 +:1003A00080916C01826080936C010895C0DF089594 +:1003B00080ED91E0B3DFB7DF08958091430188239A +:1003C00039F480916C018E7F80936C0186E02EC0A1 +:1003D000813099F5B7DF9C0188B1817080935F010E +:1003E0002932310528F440990BC0409A389A08C048 +:1003F00083E0283E380720F0409B02C040983898A0 +:1004000020935D0130935E0180916B018160809348 +:100410006B0180916C018D7F80936C0180916501EF +:10042000882319F081E08093440187E083DF809185 +:1004300043018F5F809343010895823021F58091BD +:100440006501882319F081E0809344017BDF80936C +:1004500060019093610180914401882321F081E043 +:100460008093620102C01092620110924401809157 +:100470006B01826080936B0180916C018D7F809312 +:100480006C011092430108953998419A8AB18F7393 +:100490008AB98BB1806C8BB984B1877E84B985B100 +:1004A000886185B953985B9A88E180936B00E8E690 +:1004B000F0E080818160808382E080936C008081A5 +:1004C0008260808380E880936D0080818460808377 +:1004D000E9E6F0E0808188608083E99A0895419898 +:1004E000399A8BB18F738BB98AB1806C8AB985B117 +:1004F000877E85B984B1886184B95B98539A0895E1 +:10050000823029F4609300016093020108958350C2 +:10051000823020F46093010160930301089580917B +:1005200065018B7F8093650110926D018BB18C7F8B +:100530008BB90895909165019460909365018093C3 +:100540006D015998589A08954E9B04C04F9B02C064 +:1005500082E003C04F9903C081E0ECDF089582E0A0 +:1005600080936D0108954F9B03C081E0E3DF089500 +:1005700082E080936D0108951F920F920FB60F9243 +:1005800011248F934F9904C081E080930F0102C022 +:1005900010920F0180916D01882369F08150809342 +:1005A0006D01882341F48BB18C7F8BB95898599A8F +:1005B00084E0809347018F910F900FBE0F901F90A2 +:1005C000189580916501877F8093650110926F0176 +:1005D0008BB18C7F8BB90895909165019860909351 +:1005E000650180936F015898599A08951B9902C02C +:1005F000599B05C082E0F0DF81E080934A010895B5 +:100600001C9902C0599B05C082E0E6DF82E080931E +:100610004A0108951F920F920FB60F9211248F93E3 +:100620009F9383B199278095909588719070892BBD +:1006300021F180916F01882301F1982F91509093BF +:100640006F0180914A01882361F0813019F41B9970 +:1006500008C004C0823029F41C9903C010926F01B5 +:1006600002C0992351F410924A018BB18C7F8BB94F +:100670005998589A88E0809348019F918F910F90E4 +:100680000FBE0F901F901895809165018F7E80930B +:10069000650110927101809172018E7F80937201C9 +:1006A0005C982898089590916501906190936501F8 +:1006B00080937101609302015C9890917201916046 +:1006C0009093720185B1892B85B908958FEF80933E +:1006D000700165E082E0E7DF08958091640188237E +:1006E00021F465E081E0DFDF089582E0809371010D +:1006F000089580916401813019F465E0D4DF089594 +:1007000082E0809371010895809165018C7F8093D0 +:1007100065011092730180917201897F809372014B +:1007200085B1897F85B90895982F80916501816091 +:10073000809365019093730180914C01813039F46D +:100740004B9B05C0992319F09F5F90937301109202 +:100750004C0160930301909172019B7F9260909392 +:10076000720185B1892B85B90895982F8091650113 +:100770008260809365019093730180914C0188237E +:1007800039F44B9B05C0992319F09F5F9093730137 +:1007900081E080934C0160930301909172019D7FF1 +:1007A00094609093720185B1892B85B90895282FA3 +:1007B000962F882341F440FF03C06093470160E017 +:1007C000862FB8DE0895813041F440FF03C0609366 +:1007D000480160E0862F00DF0895823059F440FD23 +:1007E00002C0862F03C06093490180E06091000140 +:1007F0005ADF08958350823078F440FF02C060933E +:100800004B01233029F460910101892F8DDF089578 +:1008100060910101892FA9DF08951F920F920FB6F1 +:100820000F9211248F939F93809173018823C9F0B5 +:100830008150809373018823A1F490917201997F74 +:100840009093720185B1897F85B98AE080934B01CD +:1008500080914C01882311F4946001C092609093C0 +:1008600072019F918F910F900FBE0F901F9018955E +:100870009091450180910201981709F42898809180 +:100880000301981719F485B1897F85B9892F8F5F86 +:1008900080934501863039F41092450185B19091DD +:1008A0007201892B85B980917001882361F0815094 +:1008B00080937001882339F4809172018E7F809338 +:1008C00072015C98289880914901882341F08150F9 +:1008D00080934901882319F4D7DE10920201809198 +:1008E0004701882331F0815080934701882309F420 +:1008F00016DE80914801882331F0815080934801B1 +:10090000882309F45EDE80914B01882331F0815009 +:1009100080934B01882309F4F7DE809146018823F8 +:1009200061F0815080934601882339F482E08BBBCB +:100930008091680082608093680008951F920F92F2 +:100940000FB60F9211242F933F934F938F939F9342 +:1009500082E080934601809168008D7F80936800DB +:10096000319943C08091640191E0892780936401AB +:1009700040917001442321F1809171018130E9F4AB +:1009800080917401882399F0242F33279927409769 +:100990002817390764F4809164018E7F8093640185 +:1009A00010927001109274011092710112C0409364 +:1009B00074018FEF8093700118C08FEF80937001E6 +:1009C00080917101882389F081508093710188237F +:1009D00061F4809172018E7F809372015C982898F7 +:1009E00028985C9A84E0809349019F918F914F9160 +:1009F0003F912F910F900FBE0F901F90189591E08F +:100A0000909380008AE08093810090936F00089516 +:100A100010928100EFE6F0E080818D7F8083429824 +:100A200080914E01837F80934E0180818B7F8083F4 +:100A3000439808951F920F920FB60F9211248F932F +:100A40009F9388B190914E01892B88B99F918F9186 +:100A50000F900FBE0F901F9018951F920F920FB618 +:100A60000F92112442980F900FBE0F901F9018956F +:100A70001F920F920FB60F92112443980F900FBE42 +:100A80000F901F9018959C01E2E1F1E013C020FF48 +:100A900002C02E7F05C021FF03C02D7FEFE1F1E0F2 +:100AA00091E092834187662329F0608783858823... [truncated message content] |
From: jaguarondi <c2m...@c2...> - 2008-08-11 13:03:00
|
Author: jaguarondi Date: 2008-08-11 15:02:35 +0200 (Mon, 11 Aug 2008) New Revision: 1461 Modified: firmware/fuxusb/trunk/CHANGES Log: * Found some old changelog for 0.4.0. Modified: firmware/fuxusb/trunk/CHANGES =================================================================== --- firmware/fuxusb/trunk/CHANGES 2008-08-11 13:00:08 UTC (rev 1460) +++ firmware/fuxusb/trunk/CHANGES 2008-08-11 13:02:35 UTC (rev 1461) @@ -20,3 +20,23 @@ * Added doxygen documentation. * Versioning is available through dongle commands and not standard commands. + +Version 0.4.0: + + * Changed the descriptor, some errors have been corrected for the audio + endpoint and audio seems to behave better now, at least skype can open the + tuxdroid device correctly. + + * The dongle now resets after bootloading so unplugging is not necessary + anymore. + + * Added a command to reset the dongle (raw : 1, 1, 0, 0, 0xFE). + This command detach and attach the USB and resets the uC. The RF will also + be reseted during the enum process. + + * Refactoring of parts of the code, especially bank management. This should + prevent some bugs in the future when the daemon will change. + + * Fixed some bugs with the version number section and the eeprom programming. + + * Added some protections for bootloading. |
From: jaguarondi <c2m...@c2...> - 2008-08-11 12:59:58
|
Author: jaguarondi Date: 2008-08-11 15:00:08 +0200 (Mon, 11 Aug 2008) New Revision: 1460 Modified: firmware/fuxusb/trunk/src/version.h firmware/tuxaudio/trunk/version.h firmware/tuxcore/trunk/version.h Log: * Bumped to 0.5.1 (SVN/UNRELEASED). Modified: firmware/fuxusb/trunk/src/version.h =================================================================== --- firmware/fuxusb/trunk/src/version.h 2008-08-11 12:56:32 UTC (rev 1459) +++ firmware/fuxusb/trunk/src/version.h 2008-08-11 13:00:08 UTC (rev 1460) @@ -31,12 +31,12 @@ */ #define VER_MAJOR 0 #define VER_MINOR 5 -#define VER_UPDATE 0 +#define VER_UPDATE 1 /** RELEASE should be set to '1' prior to tagging a release, and reset * immediately after. It's like appending (SVN_UNRELEASED) to a version number * when equal to '0'. */ -#define RELEASE 1 +#define RELEASE 0 #define AUTHOR_ID 0 /* official release */ #define VARIATION 0 /* generic firmware */ Modified: firmware/tuxaudio/trunk/version.h =================================================================== --- firmware/tuxaudio/trunk/version.h 2008-08-11 12:56:32 UTC (rev 1459) +++ firmware/tuxaudio/trunk/version.h 2008-08-11 13:00:08 UTC (rev 1460) @@ -30,11 +30,11 @@ #define VER_MAJOR 0 #define VER_MINOR 5 -#define VER_UPDATE 0 +#define VER_UPDATE 1 /** RELEASE should be set to '1' prior to tagging a release, and reset * immediately after. It's like appending (SVN_UNRELEASED) to a version number * when equal to '0'. */ -#define RELEASE 1 +#define RELEASE 0 #define AUTHOR_ID 0 /* official release */ #define VARIATION 0 /* generic firmware */ Modified: firmware/tuxcore/trunk/version.h =================================================================== --- firmware/tuxcore/trunk/version.h 2008-08-11 12:56:32 UTC (rev 1459) +++ firmware/tuxcore/trunk/version.h 2008-08-11 13:00:08 UTC (rev 1460) @@ -30,11 +30,11 @@ #define VER_MAJOR 0 #define VER_MINOR 5 -#define VER_UPDATE 0 +#define VER_UPDATE 1 /** RELEASE should be set to '1' prior to tagging a release, and reset * immediately after. It's like appending (SVN_UNRELEASED) to a version number * when equal to '0'. */ -#define RELEASE 1 +#define RELEASE 0 #define AUTHOR_ID 0 /* official release */ #define VARIATION 0 /* generic firmware */ |