Menu
▾
▴
[JavaAmp-CVS] javaamp/src Settings.java,NONE,1.1 EqualizerDialog.java,1.15,1.16 GraphicsLoader.java,1.2,1.3 JavaAmp.java,1.13,1.14 PlayDialog.java,1.13,1.14 PlaylistDialog.java,1.23,1.24 PreferencesDialog.java,1.3,1.4
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13275/src Modified Files: EqualizerDialog.java GraphicsLoader.java JavaAmp.java PlayDialog.java PlaylistDialog.java PreferencesDialog.java Added Files: Settings.java Log Message: Settings Index: EqualizerDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- EqualizerDialog.java 19 Mar 2006 10:17:39 -0000 1.15 +++ EqualizerDialog.java 25 Mar 2006 10:35:19 -0000 1.16 @@ -101,27 +101,27 @@ return; ow += e.getX() - mx; oh += e.getY() - my; - if(owner.docking) { + if(Settings.docking) { Point p = new Point(ow, oh); - Docker.dockScreen(owner.dockingd, p, new Rectangle(ow, oh, + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), getToolkit().getScreenInsets( getGraphicsConfiguration())); ow = p.x; oh = p.y; owner.playDialog.dockedEqualizer = Docker.dock( - owner.dockingd, p, new Rectangle(ow, oh, getWidth(), + Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.playDialog.getBounds()); ow = p.x; oh = p.y; if(owner.playlistDialog.isVisible()) { - dockedPlaylist = Docker.dock(owner.dockingd, p, + dockedPlaylist = Docker.dock(Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); ow = p.x; oh = p.y; } else - dockedPlaylist = Docker.isDocked(owner.dockingd, p, + dockedPlaylist = Docker.isDocked(Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); } --- NEW FILE: Settings.java --- import java.awt.*; import java.io.*; import java.util.*; public class Settings { static String language; static String proxyHost; static int proxyPort; static boolean splash; static boolean multiple; static boolean update; static boolean showInTaskbar; static boolean showInSysTray; static boolean scrollTitle; static boolean docking; static int dockingd; static boolean playDialogVisible; static int playDialogX; static int playDialogY; static boolean equalizerDialogVisible; static int equalizerDialogX; static int equalizerDialogY; static boolean playlistDialogVisible; static int playlistDialogX; static int playlistDialogY; static int playlistDialogWidth; static int playlistDialogHeight; static { try { Properties p = new Properties(); p.load(new FileInputStream(new File(System.getProperty("user.dir"), "config.ini"))); language = p.get("Language").toString(); if(language == null) language = "English"; proxyHost = p.get("ProxyHost").toString(); if(proxyHost == null) proxyHost = ""; String t = p.get("ProxyPort").toString(); if(t == null) proxyPort = -1; else try { proxyPort = Integer.parseInt(t); if(proxyPort < 0 || proxyPort > 65535) proxyPort = -1; } catch(Exception e) { proxyPort = -1; } t = p.get("Splash").toString(); if(t == null) splash = true; else splash = Boolean.valueOf(t); t = p.get("Multiple").toString(); if(t == null) multiple = true; else multiple = Boolean.valueOf(t); t = p.get("Update").toString(); if(t == null) update = true; else update = Boolean.valueOf(t); t = p.get("ShowInTaskbar").toString(); if(t == null) showInTaskbar = true; else showInTaskbar = Boolean.valueOf(t); t = p.get("ShowInSysTray").toString(); if(t == null) showInSysTray = false; else showInSysTray = Boolean.valueOf(t); t = p.get("ScrollTitle").toString(); if(t == null) scrollTitle = false; else scrollTitle = Boolean.valueOf(t); t = p.get("Docking").toString(); if(t == null) docking = true; else docking = Boolean.valueOf(t); t = p.get("DockingDistance").toString(); if(t == null) dockingd = 10; else try { dockingd = Integer.parseInt(t); if(dockingd < 0) dockingd = 0; else if(dockingd > 50) dockingd = 50; } catch(Exception e) { dockingd = 10; } } catch(Exception e) { language = "English"; proxyHost = ""; proxyPort = -1; splash = true; multiple = true; update = true; showInTaskbar = true; showInSysTray = false; scrollTitle = false; docking = true; dockingd = 10; int x = (Toolkit.getDefaultToolkit().getScreenSize().width - 275) / 2; int y = (Toolkit.getDefaultToolkit().getScreenSize().height - 345) / 2; playDialogVisible = true; playDialogX = x; playDialogY = y; equalizerDialogVisible = true; equalizerDialogX = x; equalizerDialogY = y + 115; playlistDialogVisible = true; playlistDialogX = x; playlistDialogY = y + 230; playlistDialogWidth = 275; playlistDialogHeight = 115; } } public final static void storeSettings() throws Exception { Properties p = new Properties(); p.put("Lanuage", language); p.put("ProxyHost", proxyHost); p.put("ProxyPort", "" + proxyPort); p.put("Splash", Boolean.toString(splash)); p.put("Multiple", Boolean.toString(multiple)); p.put("Update", Boolean.toString(update)); p.put("ShowInTaskbar", Boolean.toString(showInTaskbar)); p.put("ShowInSysTray", Boolean.toString(showInSysTray)); p.put("ScrollTitle", Boolean.toString(scrollTitle)); p.put("Docking", Boolean.toString(docking)); p.put("DockingDistance", "" + dockingd); 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.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- PreferencesDialog.java 25 Mar 2006 06:51:45 -0000 1.3 +++ PreferencesDialog.java 25 Mar 2006 10:35:19 -0000 1.4 @@ -22,6 +22,9 @@ DefaultMutableTreeNode mtnVisualization; JPanel panJavaAmp; + JLabel lblLwjgl; + JLabel lblFmod; + JLabel lblOpenGl; JPanel panGenPref; JLabel lblLanguage; JComboBox cmbLanguage; @@ -125,6 +128,45 @@ panJavaAmp.setBorder(BorderFactory.createTitledBorder( "JavaAmp")); panJavaAmp.setBounds(170, 10, 395, 400); + lblLwjgl = new JLabel() { + public void paint(Graphics g) { + g.drawImage(GraphicsLoader.jaa2, 0, 0, lblLwjgl); + } + }; + lblLwjgl.setToolTipText("LWJGL: http://www.lwjgl.org/"); + lblLwjgl.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent e) { + Sys.openURL("http://www.lwjgl.org"); + } + }); + lblLwjgl.setBounds(15, 15, 88, 31); + panJavaAmp.add(lblLwjgl); + lblFmod = new JLabel() { + public void paint(Graphics g) { + g.drawImage(GraphicsLoader.jaa3, 0, 0, lblFmod); + } + }; + lblFmod.setToolTipText("FMOD: http://www.fmod.org/"); + lblFmod.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent e) { + Sys.openURL("http://www.fmod.org/"); + } + }); + lblFmod.setBounds(15, 50, 88, 31); + panJavaAmp.add(lblFmod); + lblOpenGl = new JLabel() { + public void paint(Graphics g) { + g.drawImage(GraphicsLoader.jaa4, 0, 0, lblOpenGl); + } + }; + lblOpenGl.setToolTipText("OpenGL: http://www.opengl.org/"); + lblOpenGl.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent e) { + Sys.openURL("http://www.opengl.org/"); + } + }); + lblOpenGl.setBounds(15, 85, 88, 39); + panJavaAmp.add(lblOpenGl); panGenPref = new JPanel(null); panGenPref.setBorder(BorderFactory.createTitledBorder( Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- JavaAmp.java 25 Mar 2006 06:51:45 -0000 1.13 +++ JavaAmp.java 25 Mar 2006 10:35:19 -0000 1.14 @@ -15,14 +15,22 @@ VisualizationBridge vb; - boolean docking; - int dockingd; - JFileChooser fchChooser; JOptionPane oppMessages; Random random; public JavaAmp() throws Exception { + Runtime.getRuntime().addShutdownHook(new Thread() { + public void run() { + try { + Settings.storeSettings(); + } + catch(Exception e) { + e.printStackTrace(); + } + } + }); + try { Language.loadLanguage(getClass(), "English"); } @@ -41,9 +49,6 @@ oppMessages = new JOptionPane(); random = new Random(); - docking = true; - dockingd = 10; - setTitle("JavaAmp"); setDefaultCloseOperation(EXIT_ON_CLOSE); setUndecorated(true); Index: PlaylistDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlaylistDialog.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- PlaylistDialog.java 19 Mar 2006 10:17:39 -0000 1.23 +++ PlaylistDialog.java 25 Mar 2006 10:35:19 -0000 1.24 @@ -137,20 +137,20 @@ else if(ct == 2) { ow += e.getX() - mx; oh += e.getY() - my; - if(owner.docking) { + if(Settings.docking) { Point p = new Point(ow, oh); - Docker.dockScreen(owner.dockingd, p, new Rectangle(ow, + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), getToolkit().getScreenInsets( getGraphicsConfiguration())); owner.playDialog.dockedPlaylist = Docker.dock( - owner.dockingd, p, new Rectangle(ow, oh, getWidth(), + Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.playDialog.getBounds()); ow = p.x; oh = p.y; if(owner.equalizerDialog.isVisible()) { owner.equalizerDialog.dockedPlaylist = Docker.dock( - owner.dockingd, p, new Rectangle(ow, oh, + Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.equalizerDialog.getBounds()); ow = p.x; @@ -158,7 +158,7 @@ } else owner.equalizerDialog.dockedPlaylist = - Docker.isDocked(owner.dockingd, p, + Docker.isDocked(Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.equalizerDialog.getBounds()); } Index: PlayDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- PlayDialog.java 19 Mar 2006 10:17:39 -0000 1.13 +++ PlayDialog.java 25 Mar 2006 10:35:19 -0000 1.14 @@ -124,17 +124,17 @@ return; ow += e.getX() - mx; oh += e.getY() - my; - if(owner.docking) { + if(Settings.docking) { Point p = new Point(ow, oh); - Docker.dockScreen(owner.dockingd, p, new Rectangle(ow, oh, + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), getToolkit().getScreenInsets( getGraphicsConfiguration())); if(!dockedPlaylist2 && owner.playlistDialog.isVisible()) - dockedPlaylist = Docker.dock(owner.dockingd, p, new + dockedPlaylist = Docker.dock(Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); if(!dockedEqualizer2 && owner.equalizerDialog.isVisible()) - dockedEqualizer = Docker.dock(owner.dockingd, p, new + dockedEqualizer = Docker.dock(Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.equalizerDialog.getBounds()); ow = p.x; @@ -144,7 +144,7 @@ owner.equalizerDialog.dockedPlaylist2)) && owner.playlistDialog.isVisible()) { Point p = new Point(ow + ow2, oh + oh2); - Docker.dockScreen(owner.dockingd, p, new Rectangle(ow + ow2, + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow2, oh + oh2, owner.playlistDialog.getWidth(), owner.playlistDialog.getHeight()), getToolkit().getScreenInsets( @@ -156,7 +156,7 @@ owner.equalizerDialog.dockedPlaylist2)) && owner.equalizerDialog.isVisible()) { Point p = new Point(ow + ow3, oh + oh3); - Docker.dockScreen(owner.dockingd, p, new Rectangle(ow + ow3, + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow3, oh + oh3, owner.equalizerDialog.getWidth(), owner.equalizerDialog.getHeight()), getToolkit().getScreenInsets( @@ -171,7 +171,7 @@ owner.playlistDialog.isVisible() && owner.equalizerDialog.isVisible()) { owner.equalizerDialog.dockedPlaylist = - Docker.dock(owner.dockingd, p, new Rectangle(ow + + Docker.dock(Settings.dockingd, p, new Rectangle(ow + ow2, oh + oh2, owner.playlistDialog.getWidth(), owner.playlistDialog.getHeight()), owner.equalizerDialog.getBounds()); @@ -187,7 +187,7 @@ owner.playlistDialog.isVisible() && owner.equalizerDialog.isVisible()) { owner.equalizerDialog.dockedPlaylist = - Docker.dock(owner.dockingd, p, new Rectangle(ow + + Docker.dock(Settings.dockingd, p, new Rectangle(ow + ow3, oh + oh3, owner.equalizerDialog.getWidth(), owner.equalizerDialog.getHeight()), owner.playlistDialog.getBounds()); Index: GraphicsLoader.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/GraphicsLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- GraphicsLoader.java 19 Mar 2006 10:17:39 -0000 1.2 +++ GraphicsLoader.java 25 Mar 2006 10:35:19 -0000 1.3 @@ -7,7 +7,7 @@ private static int cid; // JavaAmp - static Image jaa1; + static Image jaa1, jaa2, jaa3, jaa4; // EqualizerDialog static Image eqd1, eqd2; @@ -24,6 +24,9 @@ // JavaAmp jaa1 = tk.getImage(cls.getResource("javaamp32.png")); + jaa2 = tk.getImage(cls.getResource("lwjgl.png")); + jaa3 = tk.getImage(cls.getResource("fmod.png")); + jaa4 = tk.getImage(cls.getResource("opengl.png")); // EqualizerDialog eqd1 = tk.getImage(cls.getResource("presets.png")); @@ -49,6 +52,9 @@ pd17 = tk.getImage(cls.getResource("javaamp3.png")); addImage(jaa1); + addImage(jaa2); + addImage(jaa3); + addImage(jaa4); addImage(eqd1); addImage(eqd2); |
