Menu
▾
▴
[JavaAmp-CVS] javaamp/src JavaAmp.java,1.18,1.19 JavaAmpToolkit.java,1.2,1.3 Language.java,1.4,1.5 PlayDialog.java,1.16,1.17 PreferencesDialog.java,1.5,1.6 Settings.java,1.5,1.6 Spline.java,1.2,1.3
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6610/src Modified Files: JavaAmp.java JavaAmpToolkit.java Language.java PlayDialog.java PreferencesDialog.java Settings.java Spline.java Log Message: Index: Language.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Language.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Language.java 5 Apr 2006 20:22:05 -0000 1.4 +++ Language.java 8 Apr 2006 15:38:03 -0000 1.5 @@ -113,7 +113,6 @@ english.put("STOP", "Stop"); english.put("SYSTRAY", "System tray"); english.put("TASKBAR", "Taskbar"); - english.put("THEME", "Theme:"); english.put("TITLES", "Titles"); english.put("TRACK_ID", "Track ID"); english.put("UNDEFINED", "Undefined"); @@ -122,6 +121,7 @@ english.put("UNKNOWN_FILE_EXCEPTION", "Unknown file exception"); english.put("UNABLE_OPEN_HTML", "Unable to open HTML file"); english.put("URL", "URL"); + english.put("USED_TECHNOLOGIES", "Used technologies:"); english.put("VALUE", "Value"); english.put("VISUALIZATION", "Visualization"); english.put("VOLUME", "Volume"); Index: Spline.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Spline.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Spline.java 19 Mar 2006 10:17:39 -0000 1.2 +++ Spline.java 8 Apr 2006 15:38:03 -0000 1.3 @@ -3,7 +3,7 @@ Fundamentals of Numerical Computing DATE: February 27, 1996 minimal change convertion to Java August 11, 2003 - Modified and standardized by Andreas Wiesbauer, March 2006. + Modified and standardized by Andreas Wiesbauer, March-April 2006. */ import java.text.*; @@ -56,7 +56,7 @@ dHeapSort(x, f); // Calculate coefficients for the tri-diagonal system: store - // sub-diagonal in b, diagonal in d, difference quotient in c. + // sub-diagonal in b, diagonal in d, difference quotient in c. b[0] = x[1] - x[0]; c[0] = (f[1] - f[0]) / b[0]; if(n == 2) { @@ -78,7 +78,7 @@ d[n - 1] = 2.0 * b[n - 2]; // Calculate estimates for the end slopes. Use polynomials - // interpolating data nearest the end. + // interpolating data nearest the end. fp1 = c[0] - b[0] * (c[1] - c[0]) / (b[0] + b[1]); if(n > 3) fp1 = fp1 + b[0] * ((b[0] + b[1]) * (c[2] - c[1]) / (b[1] + b[2]) - @@ -138,7 +138,7 @@ if(t > x[n - 1]) throw new RuntimeException(Language.get("ABOVE_SPLINE")); if(t > x[n - 2]) - interval = n-2; + interval = n - 2; else if (t >= x[last_interval]) for(int j = last_interval; j < n && t >= x[j]; j++) interval = j; @@ -176,7 +176,7 @@ tkey = key[0]; key [0] = key [i]; key [i] = tkey; - ttrail = trail[0]; + ttrail = trail[0]; trail [0] = trail[i]; trail [i] = ttrail; } @@ -200,10 +200,10 @@ r_child; } if(key[max_child_index] > key[parent_temp]) { - tkey = key[max_child_index]; + tkey = key[max_child_index]; key[max_child_index] = key[parent_temp]; key[parent_temp] = tkey; - ttrail = trail[max_child_index]; + ttrail = trail[max_child_index]; trail[max_child_index] = trail[parent_temp]; trail[parent_temp] = ttrail; parent_temp = max_child_index; Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Settings.java 5 Apr 2006 20:22:05 -0000 1.5 +++ Settings.java 8 Apr 2006 15:38:03 -0000 1.6 @@ -193,7 +193,7 @@ p.put("Language", language); p.put("ProxyEnable", Boolean.toString(proxyEnabled)); p.put("ProxyHost", proxyHost); - p.put("ProxyPort", "" + proxyPort); + p.put("ProxyPort", Integer.toString(proxyPort)); p.put("Splash", Boolean.toString(splash)); p.put("Multiple", Boolean.toString(multiple)); p.put("Update", Boolean.toString(update)); @@ -201,27 +201,27 @@ p.put("ShowInSysTray", Boolean.toString(showInSysTray)); p.put("ScrollTitle", Boolean.toString(scrollTitle)); p.put("Docking", Boolean.toString(docking)); - p.put("DockingDistance", "" + dockingd); - p.put("MixRate", "" + mixrate); - p.put("MaxChannels", "" + maxchannels); - p.put("BufferSize", "" + buffersize); + p.put("DockingDistance", Integer.toString(dockingd)); + p.put("MixRate", Integer.toString(mixrate)); + p.put("MaxChannels", Integer.toString(maxchannels)); + p.put("BufferSize", Integer.toString(buffersize)); p.put("SpeakerMode", getStringByValue(speakermode, SPEAKER_MODES, SPEAKER_MODES_VALS, "STEREO")); p.put("MixerType", getStringByValue(mixertype, MIXER_TYPES, MIXER_TYPES_VALS, "AUTODETECT")); p.put("Driver", driver); p.put("PlayDialogVisible", Boolean.toString(playDialogVisible)); - p.put("PlayDialogX", "" + playDialogX); - p.put("PlayDialogY", "" + playDialogY); + p.put("PlayDialogX", Integer.toString(playDialogX)); + p.put("PlayDialogY", Integer.toString(playDialogY)); p.put("EqualizerDialogVisible", Boolean.toString( equalizerDialogVisible)); - p.put("EqualizerDialogX", "" + equalizerDialogX); - p.put("EqualizerDialogY", "" + equalizerDialogY); + p.put("EqualizerDialogX", Integer.toString(equalizerDialogX)); + p.put("EqualizerDialogY", Integer.toString(equalizerDialogY)); p.put("PlaylistDialogVisible", Boolean.toString(playlistDialogVisible)); - p.put("PlaylistDialogX", "" + playlistDialogX); - p.put("PlaylistDialogY", "" + playlistDialogY); - p.put("PlaylistDialogWidth", "" + playlistDialogWidth); - p.put("PlaylistDialogHeight", "" + playlistDialogHeight); + p.put("PlaylistDialogX", Integer.toString(playlistDialogX)); + p.put("PlaylistDialogY", Integer.toString(playlistDialogY)); + p.put("PlaylistDialogWidth", Integer.toString(playlistDialogWidth)); + p.put("PlaylistDialogHeight",Integer.toString(playlistDialogHeight)); p.store(new FileOutputStream(new File(System.getProperty("user.dir"), "config.ini")), null); } Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- PreferencesDialog.java 5 Apr 2006 20:22:05 -0000 1.5 +++ PreferencesDialog.java 8 Apr 2006 15:38:03 -0000 1.6 @@ -23,6 +23,7 @@ DefaultMutableTreeNode mtnVisualization; JPanel panJavaAmp; + JLabel lblTechnologies; JLabel lblLwjgl; JLabel lblFmod; JLabel lblOpenGl; @@ -48,8 +49,6 @@ JPanel panAppearance; JLabel lblLookAndFeel; JComboBox cmbLookAndFeel; - JLabel lblTheme; - JComboBox cmbTheme; JCheckBox chbDocking; JLabel lblDockingD; JTextField tfdDockingD; @@ -72,7 +71,7 @@ setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { - closing(); + close(); } }); @@ -140,26 +139,29 @@ btnClose.setBounds(10, 385, 150, 25); btnClose.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - closing(); + close(); } }); panJavaAmp = new JPanel(null); - panJavaAmp.setBorder(BorderFactory.createTitledBorder( - "JavaAmp")); + panJavaAmp.setBorder(BorderFactory.createTitledBorder("JavaAmp")); panJavaAmp.setBounds(170, 10, 395, 400); + lblTechnologies = new JLabel(Language.get("USED_TECHNOLOGIES")); + lblTechnologies.setBounds(15, 15, 375, 20); + panJavaAmp.add(lblTechnologies); lblLwjgl = new JLabel() { public void paint(Graphics g) { g.drawImage(GraphicsLoader.jaa2, 0, 0, lblLwjgl); } }; lblLwjgl.setToolTipText("LWJGL: http://www.lwjgl.org/"); + lblLwjgl.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); lblLwjgl.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) { Sys.openURL("http://www.lwjgl.org"); } }); - lblLwjgl.setBounds(15, 15, 88, 31); + lblLwjgl.setBounds(25, 40, 88, 31); panJavaAmp.add(lblLwjgl); lblFmod = new JLabel() { public void paint(Graphics g) { @@ -167,12 +169,13 @@ } }; lblFmod.setToolTipText("FMOD: http://www.fmod.org/"); + lblFmod.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); lblFmod.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) { Sys.openURL("http://www.fmod.org/"); } }); - lblFmod.setBounds(15, 50, 88, 31); + lblFmod.setBounds(118, 40, 88, 31); panJavaAmp.add(lblFmod); lblOpenGl = new JLabel() { public void paint(Graphics g) { @@ -180,12 +183,13 @@ } }; lblOpenGl.setToolTipText("OpenGL: http://www.opengl.org/"); + lblOpenGl.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); lblOpenGl.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) { Sys.openURL("http://www.opengl.org/"); } }); - lblOpenGl.setBounds(15, 85, 88, 31); + lblOpenGl.setBounds(211, 40, 88, 31); panJavaAmp.add(lblOpenGl); panGenPref = new JPanel(null); @@ -193,8 +197,7 @@ Language.get("GENERAL_PREFERENCES"))); panGenPref.setBounds(170, 10, 395, 400); lblLanguage = new JLabel(Language.get("LANGUAGE")); - lblLanguage.setBounds(15, 15, lblLanguage.getFontMetrics( - lblLanguage.getFont()).stringWidth(lblLanguage.getText()), 20); + lblLanguage.setBounds(15, 15, 65, 20); panGenPref.add(lblLanguage); String[] langs = Language.getAvailableLanguages(owner.getClass()); Arrays.sort(langs); @@ -211,9 +214,7 @@ Sys.openURL("http://javaamp.sourceforge.net/"); } }); - lblFindLanguages.setBounds(250, 15, lblFindLanguages.getFontMetrics( - lblFindLanguages.getFont()).stringWidth(Language.get( - "FIND_LANGUAGES")), 20); + lblFindLanguages.setBounds(250, 15, 130, 20); panGenPref.add(lblFindLanguages); panInternet = new JPanel(null); panInternet.setBorder(BorderFactory.createTitledBorder( @@ -306,20 +307,14 @@ } }); panAppearance.add(cmbLookAndFeel); - lblTheme = new JLabel(Language.get("THEME")); - lblTheme.setBounds(10, 40, 90, 20); - panAppearance.add(lblTheme); - cmbTheme = new JComboBox(); - cmbTheme.setBounds(100, 40, 280, 20); - panAppearance.add(cmbTheme); chbDocking = new JCheckBox(Language.get("DOCKING")); - chbDocking.setBounds(10, 65, 370, 20); + chbDocking.setBounds(10, 40, 370, 20); panAppearance.add(chbDocking); lblDockingD = new JLabel(Language.get("DOCKINGD")); - lblDockingD.setBounds(10, 90, 140, 20); + lblDockingD.setBounds(10, 65, 140, 20); panAppearance.add(lblDockingD); tfdDockingD = new JTextField(); - tfdDockingD.setBounds(150, 90, 50, 20); + tfdDockingD.setBounds(150, 65, 50, 20); panAppearance.add(tfdDockingD); panPlugins = new JPanel(null); @@ -363,7 +358,27 @@ pan.setVisible(true); } - public void closing() { + public void open() { + cmbLanguage.setSelectedItem(Settings.language); + chbProxy.setSelected(Settings.proxyEnabled); + tfdProxyHost.setText(Settings.proxyHost); + if(Settings.proxyPort >= 0) + tfdProxyPort.setText(Integer.toString(Settings.proxyPort)); + else + tfdProxyPort.setText(""); + chbSplash.setSelected(Settings.splash); + chbMultiple.setSelected(Settings.multiple); + chbUpdate.setSelected(Settings.update); + chbTaskbar.setSelected(Settings.showInTaskbar); + chbSysTray.setSelected(Settings.showInSysTray); + chbScroll.setSelected(Settings.scrollTitle); + //Settings.docking = ... + //Settings.dockingd = ... + //... + setVisible(true); + } + + public void close() { Settings.language = (String)cmbLanguage.getSelectedItem(); Settings.proxyEnabled = chbProxy.isSelected(); Settings.proxyHost = tfdProxyHost.getText(); Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- JavaAmp.java 5 Apr 2006 20:22:05 -0000 1.18 +++ JavaAmp.java 8 Apr 2006 15:38:03 -0000 1.19 @@ -7,8 +7,8 @@ public class JavaAmp extends JFrame { private final static long serialVersionUID = 0; - public final static String VERSION = "0.0.4"; - public final static String DATE = "Apr 01 2006"; + public final static String VERSION = "0.0.5 pre"; + public final static String DATE = "Apr 08 2006"; PlayDialog playDialog; PlaylistDialog playlistDialog; @@ -175,7 +175,7 @@ error(e); } if(jasplash != null) { - jasplash.setVisible(false); + jasplash.dispose(); jasplash.timer.cancel(); jasplash = null; } Index: JavaAmpToolkit.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmpToolkit.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- JavaAmpToolkit.java 3 Mar 2006 18:33:17 -0000 1.2 +++ JavaAmpToolkit.java 8 Apr 2006 15:38:03 -0000 1.3 @@ -4,17 +4,17 @@ public class JavaAmpToolkit { public final static String getDuration(int d) { - String sec = "" + d % 60; + String sec = Integer.toString(d % 60); while(sec.length() < 2) sec = '0' + sec; return (d / 60) + ":" + sec; } public final static String getDuration00(int d) { - String min = "" + d / 60; + String min = Integer.toString(d / 60); while(min.length() < 2) min = '0' + min; - String sec = "" + d % 60; + String sec = Integer.toString(d % 60); while(sec.length() < 2) sec = '0' + sec; return min + ':' + sec; Index: PlayDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- PlayDialog.java 5 Apr 2006 20:22:05 -0000 1.16 +++ PlayDialog.java 8 Apr 2006 15:38:03 -0000 1.17 @@ -631,13 +631,15 @@ "Amp</b></font><br>Copyright © 2006 Andreas Wiesbauer<br>Ver" + "sion " + JavaAmp.VERSION + " - " + JavaAmp.DATE + "<br>Visit htt" + "p://javaamp.sourceforge.net for updates.<br>Released under the c" + - "onditions of the BSD-license.</html>", "About JavaAmp", + "onditions of the BSD-license.<br><br>Java Version: " + + System.getProperty("java.version") + "<br>OS: " + + System.getProperty("os.name") + "</html>", "About JavaAmp", JOptionPane.INFORMATION_MESSAGE, new ImageIcon(GraphicsLoader.jaa1)); } public void showPreferences() { - owner.preferencesDialog.setVisible(true); + owner.preferencesDialog.open(); } public void paint(Graphics g) { |
