Menu
▾
▴
javaamp-cvs — CVS mailing list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
(7) |
Mar
(28) |
Apr
(24) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: WiESi <wi...@us...> - 2006-04-11 18:36:59
|
Update of /cvsroot/javaamp/javaamp/unstable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25295/unstable Modified Files: JavaAmp.jar Log Message: Built on 2006-04-11 Index: JavaAmp.jar =================================================================== RCS file: /cvsroot/javaamp/javaamp/unstable/JavaAmp.jar,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 Binary files /tmp/cvsjQF5xp and /tmp/cvs99ZxGL differ |
|
From: WiESi <wi...@us...> - 2006-04-11 18:36:28
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25005/src Modified Files: Docker.java EqualizerDialog.java JavaAmp.java PlayDialog.java PlaylistDialog.java Settings.java Log Message: Window docking Index: EqualizerDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- EqualizerDialog.java 11 Apr 2006 07:42:53 -0000 1.22 +++ EqualizerDialog.java 11 Apr 2006 18:36:13 -0000 1.23 @@ -19,12 +19,11 @@ JavaAmp owner; Container cntContainer; BevelBorder bebBorder; - int ct, mx, my, ow, oh, ow2, oh2; // ct: 0=Fehler, 1=Position, 2=Min, 3=Schl + int ct, mx, my, ow, oh; // ct: 0=Fehler, 1=Position, 2=Min, 3=Schl JToggleButton tobOn; JSlider sliPre; EQLabel eqlEqualizer; byte[] eqvals; - boolean dockedPlaylist, dockedPlaylist2; JButton btnPresets; JPopupMenu pomPresets; @@ -43,7 +42,6 @@ setUndecorated(true); setSize(275, 115); - dockedPlaylist = dockedPlaylist2 = true; addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { @@ -54,18 +52,11 @@ my = e.getY(); ow = getLocation().x; oh = getLocation().y; - ow2 = owner.playlistDialog.getLocation().x - ow; - oh2 = owner.playlistDialog.getLocation().y - oh; ct = 1; paint(getGraphics()); } public void mouseReleased(MouseEvent e) { - if(ct == 1) { - owner.playDialog.dockedEqualizer2 = - owner.playDialog.dockedEqualizer; - dockedPlaylist2 = dockedPlaylist; - } ct = 0; paint(getGraphics()); } @@ -196,28 +187,21 @@ oh = getLocation().y; } Point p = new Point(ow, oh); - Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight())); - ow = p.x; - oh = p.y; - owner.playDialog.dockedEqualizer = Docker.dock(p, new Rectangle(ow, oh, - getWidth(), getHeight()), owner.playDialog.getBounds()); + Docker.dockScreen(p, new Rectangle(p, getSize())); + Docker.dock(p, new Rectangle(p, getSize()), + owner.playDialog.getBounds()); + if(owner.playlistDialog.isVisible()) + Docker.dock(p, new Rectangle(p, getSize()), + owner.playlistDialog.getBounds()); ow = p.x; oh = p.y; - if(owner.playlistDialog.isVisible()) { - dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.playlistDialog.getBounds()); - ow = p.x; - oh = p.y; - } - else - dockedPlaylist = Docker.isDocked(p, new Rectangle(ow, oh, - getWidth(), getHeight()), owner.playlistDialog.getBounds()); - setLocation(ow, oh); + setLocation(p); } public void setVisible(boolean b) { super.setVisible(b); - dock(false); + if(b) + dock(false); } public void loadPreset() throws Exception { Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Settings.java 10 Apr 2006 17:51:30 -0000 1.11 +++ Settings.java 11 Apr 2006 18:36:13 -0000 1.12 @@ -58,7 +58,6 @@ static int mixertype; static String driver; - static boolean playDialogVisible; static int playDialogX; static int playDialogY; @@ -138,7 +137,6 @@ driver = getStringValue(p.get("Driver"), ""); int x = (Toolkit.getDefaultToolkit().getScreenSize().width - 275) / 2; int y = (Toolkit.getDefaultToolkit().getScreenSize().height - 345) / 2; - playDialogVisible = getBooleanValue(p.get("PlayDialogVisible"), true); playDialogX = getIntValue(p.get("PlayDialogX"), x); playDialogY = getIntValue(p.get("PlayDialogY"), y); equalizerDialogVisible = getBooleanValue(p.get( @@ -250,7 +248,6 @@ p.put("MixerType", getStringByValue(mixertype, MIXER_TYPES, MIXER_TYPES_VALS, "QUALITY_AUTODETECT")); p.put("Driver", driver); - p.put("PlayDialogVisible", Boolean.toString(playDialogVisible)); p.put("PlayDialogX", Integer.toString(playDialogX)); p.put("PlayDialogY", Integer.toString(playDialogY)); p.put("EqualizerDialogVisible", Boolean.toString( Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- JavaAmp.java 11 Apr 2006 07:42:53 -0000 1.25 +++ JavaAmp.java 11 Apr 2006 18:36:13 -0000 1.26 @@ -8,7 +8,7 @@ public class JavaAmp extends JFrame { private final static long serialVersionUID = 0; - public final static String VERSION = "0.0.5 pre"; + public final static String VERSION = "0.0.5"; public final static String DATE = "April 11 2006"; PlayDialog playDialog; @@ -28,7 +28,6 @@ Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { try { - Settings.playDialogVisible = playDialog.isVisible(); Settings.playDialogX = playDialog.getLocation().x; Settings.playDialogY = playDialog.getLocation().y; Settings.equalizerDialogVisible = @@ -104,11 +103,14 @@ Settings.playlistDialogY, Settings.playlistDialogWidth, Settings.playlistDialogHeight); + playDialog.tobEQ.setSelected(Settings.equalizerDialogVisible); + playDialog.tobPL.setSelected(Settings.playlistDialogVisible); + if(!GraphicsLoader.finishLoading()) throw new Exception(Language.get("ERROR_LOADING_GRAPHICS")); setVisible(true); - playDialog.setVisible(Settings.playDialogVisible); + playDialog.setVisible(true); equalizerDialog.setVisible(Settings.equalizerDialogVisible); playlistDialog.setVisible(Settings.playlistDialogVisible); } Index: PlaylistDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlaylistDialog.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- PlaylistDialog.java 11 Apr 2006 07:42:53 -0000 1.29 +++ PlaylistDialog.java 11 Apr 2006 18:36:13 -0000 1.30 @@ -89,18 +89,14 @@ } } public void mouseReleased(MouseEvent e) { - if(ct == 2) { - owner.playDialog.dockedPlaylist2 = - owner.playDialog.dockedPlaylist; - owner.equalizerDialog.dockedPlaylist2 = - owner.equalizerDialog.dockedPlaylist; - } if(e.getX() >= getWidth() - 15 && e.getY() >= getHeight() - 15) setCursor(Cursor.getPredefinedCursor( Cursor.SE_RESIZE_CURSOR)); else setCursor(Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR)); + ct = 0; + paint(getGraphics()); } }); addMouseMotionListener(new MouseMotionListener() { @@ -538,28 +534,21 @@ oh = getLocation().y; } Point p = new Point(ow, oh); - Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight())); - owner.playDialog.dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, - getWidth(), getHeight()), owner.playDialog.getBounds()); + Docker.dockScreen(p, new Rectangle(p, getSize())); + Docker.dock(p, new Rectangle(p, getSize()), + owner.playDialog.getBounds()); + if(owner.equalizerDialog.isVisible()) + Docker.dock(p, new Rectangle(p, getSize()), + owner.equalizerDialog.getBounds()); ow = p.x; oh = p.y; - if(owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = Docker.dock(p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.equalizerDialog.getBounds()); - ow = p.x; - oh = p.y; - } - else - owner.equalizerDialog.dockedPlaylist = Docker.isDocked(p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.equalizerDialog.getBounds()); - setLocation(ow, oh); + setLocation(p); } public void setVisible(boolean b) { super.setVisible(b); - dock(false); + if(b) + dock(false); } public void addURL() { Index: Docker.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Docker.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Docker.java 11 Apr 2006 07:42:53 -0000 1.5 +++ Docker.java 11 Apr 2006 18:36:13 -0000 1.6 @@ -56,19 +56,4 @@ o.y = r.y + r.height - t.height; return docked; } - - public final static boolean isDocked(Point o, Rectangle t, Rectangle r) { - int dd = Settings.dockingd; - if(t.x + t.width >= r.x - dd && t.x <= r.x + r.width + dd) - if(Math.abs(t.y + t.height - r.y) <= dd) - return true; - else if(Math.abs(r.y + r.height - t.y) <= dd) - return true; - if(t.y + t.height >= r.y - dd && t.y <= r.y + r.height + dd) - if(Math.abs(t.x + t.width - r.x) <= dd) - return true; - else if(Math.abs(r.x + r.width - t.x) <= dd) - return true; - return false; - } } \ No newline at end of file Index: PlayDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- PlayDialog.java 11 Apr 2006 07:42:53 -0000 1.21 +++ PlayDialog.java 11 Apr 2006 18:36:13 -0000 1.22 @@ -33,11 +33,10 @@ JavaAmp owner; Container cntContainer; BevelBorder bebBorder; - int ct, mx, my, ow, oh, ow2, oh2, ow3, oh3; // ct: 0=Fehler, 1=Position, + int ct, mx, my, ow, oh, ow2, oh2, ow3, oh3; // ct: 0=Nichts, 1=Position, // 2=Min, 3=Schl, 4=Einst + boolean meq, mpl, mep; int loopmode; // 0=kein, 1=eine datei, 2=alle dateien - boolean dockedEqualizer, dockedEqualizer2; - boolean dockedPlaylist, dockedPlaylist2; PlayQueue pq; BufferedImage buiOffscreen; @@ -54,8 +53,6 @@ setUndecorated(true); setSize(275, 115); - dockedEqualizer = dockedEqualizer2 = true; - dockedPlaylist = dockedPlaylist2 = false; addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { @@ -64,12 +61,6 @@ return; mx = e.getX(); my = e.getY(); - ow = getLocation().x; - oh = getLocation().y; - ow2 = owner.playlistDialog.getLocation().x - ow; - oh2 = owner.playlistDialog.getLocation().y - oh; - ow3 = owner.equalizerDialog.getLocation().x - ow; - oh3 = owner.equalizerDialog.getLocation().y - oh; if(my >= 12) ct = 1; else if(mx <= 11) @@ -80,16 +71,12 @@ ct = 2; else ct = 1; + if(ct == 1) + dock(false); paint(getGraphics()); } public void mouseReleased(MouseEvent e) { - if(ct == 1) { - dockedEqualizer2 = dockedEqualizer; - dockedPlaylist2 = dockedPlaylist; - owner.equalizerDialog.dockedPlaylist2 = - owner.equalizerDialog.dockedPlaylist; - } if(e.getButton() == MouseEvent.BUTTON1 && my < 12 && e.getY() < 12) if(ct == 3 && e.getX() > 262) @@ -301,12 +288,7 @@ tobEQ.setBounds(228, 55, 20, 15); tobEQ.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - boolean flag = tobEQ.isSelected(); - owner.equalizerDialog.setVisible(flag); - if(!flag && !dockedPlaylist2 && dockedEqualizer2 && - owner.equalizerDialog.dockedPlaylist2) - owner.equalizerDialog.dockedPlaylist = - owner.equalizerDialog.dockedPlaylist2 = false; + owner.equalizerDialog.setVisible(tobEQ.isSelected()); } }); @@ -316,12 +298,7 @@ tobPL.setBounds(250, 55, 20, 15); tobPL.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - boolean flag = tobPL.isSelected(); - owner.playlistDialog.setVisible(flag); - if(!flag && !dockedEqualizer && dockedPlaylist2 && - owner.equalizerDialog.dockedPlaylist2) - owner.equalizerDialog.dockedPlaylist = - owner.equalizerDialog.dockedPlaylist2 = false; + owner.playlistDialog.setVisible(tobPL.isSelected()); } }); @@ -543,79 +520,83 @@ if(!moved) { ow = getLocation().x; oh = getLocation().y; + Point p = new Point(ow, oh); + if(owner.equalizerDialog.isVisible()) + meq = Docker.dock(p, new Rectangle(p, getSize()), new Rectangle( + owner.equalizerDialog.getBounds())); + else + meq = false; + if(owner.playlistDialog.isVisible()) + mpl = Docker.dock(p, new Rectangle(p, getSize()), new Rectangle( + owner.playlistDialog.getBounds())); + else + mpl = false; + ow = p.x; + oh = p.y; + if((meq ^ mpl) && owner.equalizerDialog.isVisible() && + owner.playlistDialog.isVisible()) { + p = new Point(owner.equalizerDialog.getLocation()); + mep = Docker.dock(p, new Rectangle( + owner.equalizerDialog.getBounds()), new Rectangle( + owner.playlistDialog.getBounds())); + if(mep) + owner.equalizerDialog.setLocation(p); + } + else + mep = false; ow2 = owner.playlistDialog.getLocation().x - ow; oh2 = owner.playlistDialog.getLocation().y - oh; ow3 = owner.equalizerDialog.getLocation().x - ow; oh3 = owner.equalizerDialog.getLocation().y - oh; } Point p = new Point(ow, oh); - Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight())); - if(!dockedPlaylist2 && owner.playlistDialog.isVisible()) - dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.playlistDialog.getBounds()); - if(!dockedEqualizer2 && owner.equalizerDialog.isVisible()) - dockedEqualizer = Docker.dock(p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.equalizerDialog.getBounds()); - ow = p.x; - oh = p.y; - if((dockedPlaylist2 || (dockedEqualizer2 && - owner.equalizerDialog.dockedPlaylist2)) && - owner.playlistDialog.isVisible()) { - p = new Point(ow + ow2, oh + oh2); - Docker.dockScreen(p, new Rectangle(ow + ow2, oh + oh2, - owner.playlistDialog.getWidth(), - owner.playlistDialog.getHeight())); - ow = p.x - ow2; - oh = p.y - oh2; - } - if((dockedEqualizer2 || (dockedPlaylist2 && - owner.equalizerDialog.dockedPlaylist2)) && - owner.equalizerDialog.isVisible()) { - p = new Point(ow + ow3, oh + oh3); - Docker.dockScreen(p, new Rectangle(ow + ow3, oh + oh3, - owner.equalizerDialog.getWidth(), - owner.equalizerDialog.getHeight())); - ow = p.x - ow3; - oh = p.y - oh3; - } - if(dockedPlaylist2 || (dockedEqualizer2 && - owner.equalizerDialog.dockedPlaylist2)) { - p = new Point(ow + ow2, oh + oh2); - if(!owner.equalizerDialog.dockedPlaylist2 && - owner.playlistDialog.isVisible() && - owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = Docker.dock(p, - new Rectangle(ow + ow2, oh + oh2, - owner.playlistDialog.getWidth(), - owner.playlistDialog.getHeight()), + Docker.dockScreen(p, new Rectangle(p, getSize())); + if(owner.equalizerDialog.isVisible() && !meq && !(mep && mpl)) { + Docker.dock(p, new Rectangle(p, getSize()), + owner.equalizerDialog.getBounds()); + if(mpl) { + p.translate(ow2, oh2); + Docker.dock(p, new Rectangle(p, owner.playlistDialog.getSize()), owner.equalizerDialog.getBounds()); - ow = p.x - ow2; - oh = p.y - oh2; + p.translate(-ow2, -oh2); } - owner.playlistDialog.setLocation(ow + ow2, oh + oh2); } - if(dockedEqualizer2 || (dockedPlaylist2 && - owner.equalizerDialog.dockedPlaylist2)) { - p = new Point(ow + ow3, oh + oh3); - if(!owner.equalizerDialog.dockedPlaylist2 && - owner.playlistDialog.isVisible() && - owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = Docker.dock(p, - new Rectangle(ow + ow3, oh + oh3, - owner.equalizerDialog.getWidth(), - owner.equalizerDialog.getHeight()), + if(owner.playlistDialog.isVisible() && !mpl && !(mep && meq)) { + Docker.dock(p, new Rectangle(p, getSize()), + owner.playlistDialog.getBounds()); + if(meq) { + p.translate(ow3, oh3); + Docker.dock(p, new Rectangle(p, + owner.equalizerDialog.getSize()), owner.playlistDialog.getBounds()); - ow = p.x - ow3; - oh = p.y - oh3; + p.translate(-ow3, -oh3); } - owner.equalizerDialog.setLocation(ow + ow3, oh + oh3); } - setLocation(ow, oh); + if(mpl || (mep && meq)) { + p.translate(ow2, oh2); + Docker.dockScreen(p, new Rectangle(p, + owner.playlistDialog.getSize())); + p.translate(-ow2, -oh2); + } + if(meq || (mep && mpl)) { + p.translate(ow3, oh3); + Docker.dockScreen(p, new Rectangle(p, + owner.equalizerDialog.getSize())); + p.translate(-ow3, -oh3); + } + ow = p.x; + oh = p.y; + setLocation(p); + if(mpl || (mep && meq)) + owner.playlistDialog.setLocation(ow + ow2, oh + oh2); + if(meq || (mep && mpl)) + owner.equalizerDialog.setLocation(ow + ow3, oh + oh3); } public void setVisible(boolean b) { super.setVisible(b); - dock(false); + if(b) + dock(false); } public void showAbout() { |
|
From: WiESi <wi...@us...> - 2006-04-11 18:35:56
|
Update of /cvsroot/javaamp/javaamp/language In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24539/language Modified Files: english.ini german.ini Log Message: Index: german.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/german.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- german.ini 10 Apr 2006 10:03:20 -0000 1.5 +++ german.ini 11 Apr 2006 18:35:41 -0000 1.6 @@ -1,7 +1,7 @@ Language=German Author=Andreas Wiesbauer E-Mail=wi...@us... -Target=0.0.5 pre +Target=0.0.5 ABOVE_SPLINE=Gefragter Punkt über Spline-Bereich ACTIVATE_EQUALIZER=Equalizer aktivieren Index: english.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/english.ini,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- english.ini 10 Apr 2006 10:03:20 -0000 1.6 +++ english.ini 11 Apr 2006 18:35:41 -0000 1.7 @@ -1,7 +1,7 @@ Language=English Author=Andreas Wiesbauer E-Mail=wi...@us... -Target=0.0.5 pre +Target=0.0.5 ABOVE_SPLINE=Requested point above spline region ACTIVATE_EQUALIZER=Activate equalizer |
|
From: WiESi <wi...@us...> - 2006-04-11 07:42:58
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27010/src Modified Files: Docker.java EqualizerDialog.java JavaAmp.java PlayDialog.java PlaylistDialog.java Log Message: Updated window docking Index: Docker.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Docker.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Docker.java 11 Apr 2006 07:01:11 -0000 1.4 +++ Docker.java 11 Apr 2006 07:42:53 -0000 1.5 @@ -2,8 +2,13 @@ public class Docker { - public final static void dockScreen(Point o, Rectangle t, - GraphicsConfiguration gc) { + private static GraphicsConfiguration gc; + + public final static void init(GraphicsConfiguration graphicsConfig) { + gc = graphicsConfig; + } + + public final static void dockScreen(Point o, Rectangle t) { int dd = Settings.dockingd; Insets si = Toolkit.getDefaultToolkit().getScreenInsets(gc); Dimension sd = Toolkit.getDefaultToolkit().getScreenSize(); Index: PlayDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- PlayDialog.java 11 Apr 2006 07:01:11 -0000 1.20 +++ PlayDialog.java 11 Apr 2006 07:42:53 -0000 1.21 @@ -549,8 +549,7 @@ oh3 = owner.equalizerDialog.getLocation().y - oh; } Point p = new Point(ow, oh); - Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()), - getGraphicsConfiguration()); + Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight())); if(!dockedPlaylist2 && owner.playlistDialog.isVisible()) dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); @@ -565,7 +564,7 @@ p = new Point(ow + ow2, oh + oh2); Docker.dockScreen(p, new Rectangle(ow + ow2, oh + oh2, owner.playlistDialog.getWidth(), - owner.playlistDialog.getHeight()), getGraphicsConfiguration()); + owner.playlistDialog.getHeight())); ow = p.x - ow2; oh = p.y - oh2; } @@ -575,7 +574,7 @@ p = new Point(ow + ow3, oh + oh3); Docker.dockScreen(p, new Rectangle(ow + ow3, oh + oh3, owner.equalizerDialog.getWidth(), - owner.equalizerDialog.getHeight()), getGraphicsConfiguration()); + owner.equalizerDialog.getHeight())); ow = p.x - ow3; oh = p.y - oh3; } Index: PlaylistDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlaylistDialog.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- PlaylistDialog.java 11 Apr 2006 07:01:11 -0000 1.28 +++ PlaylistDialog.java 11 Apr 2006 07:42:53 -0000 1.29 @@ -538,8 +538,7 @@ oh = getLocation().y; } Point p = new Point(ow, oh); - Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()), - getGraphicsConfiguration()); + Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight())); owner.playDialog.dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, getWidth(), getHeight()), owner.playDialog.getBounds()); ow = p.x; Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- JavaAmp.java 11 Apr 2006 06:49:26 -0000 1.24 +++ JavaAmp.java 11 Apr 2006 07:42:53 -0000 1.25 @@ -23,6 +23,7 @@ public JavaAmp() throws Exception { GraphicsLoader.startLoading(this); + Docker.init(getGraphicsConfiguration()); Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { Index: EqualizerDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- EqualizerDialog.java 11 Apr 2006 07:01:11 -0000 1.21 +++ EqualizerDialog.java 11 Apr 2006 07:42:53 -0000 1.22 @@ -196,8 +196,7 @@ oh = getLocation().y; } Point p = new Point(ow, oh); - Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()), - getGraphicsConfiguration()); + Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight())); ow = p.x; oh = p.y; owner.playDialog.dockedEqualizer = Docker.dock(p, new Rectangle(ow, oh, |
|
From: WiESi <wi...@us...> - 2006-04-11 07:01:21
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23907/src Modified Files: Docker.java EqualizerDialog.java PlayDialog.java PlaylistDialog.java Log Message: Improved window docking code Index: Docker.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Docker.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Docker.java 25 Feb 2006 16:49:58 -0000 1.3 +++ Docker.java 11 Apr 2006 07:01:11 -0000 1.4 @@ -2,8 +2,10 @@ public class Docker { - public final static void dockScreen(int dd, Point o, Rectangle t, - Insets si) { + public final static void dockScreen(Point o, Rectangle t, + GraphicsConfiguration gc) { + int dd = Settings.dockingd; + Insets si = Toolkit.getDefaultToolkit().getScreenInsets(gc); Dimension sd = Toolkit.getDefaultToolkit().getScreenSize(); Rectangle s = new Rectangle(si.left, si.top, sd.width - si.left - si.right, sd.height - si.top - si.bottom); @@ -17,8 +19,8 @@ o.y = s.y + s.height - t.height; } - public final static boolean dock(int dd, Point o, Rectangle t, - Rectangle r) { + public final static boolean dock(Point o, Rectangle t, Rectangle r) { + int dd = Settings.dockingd; boolean docked = false; if(t.x + t.width >= r.x - dd && t.x <= r.x + r.width + dd) if(Math.abs(t.y + t.height - r.y) <= dd) { @@ -50,8 +52,8 @@ return docked; } - public final static boolean isDocked(int dd, Point o, Rectangle t, - Rectangle r) { + public final static boolean isDocked(Point o, Rectangle t, Rectangle r) { + int dd = Settings.dockingd; if(t.x + t.width >= r.x - dd && t.x <= r.x + r.width + dd) if(Math.abs(t.y + t.height - r.y) <= dd) return true; Index: PlayDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- PlayDialog.java 11 Apr 2006 06:49:26 -0000 1.19 +++ PlayDialog.java 11 Apr 2006 07:01:11 -0000 1.20 @@ -549,26 +549,23 @@ oh3 = owner.equalizerDialog.getLocation().y - oh; } Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); + Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()), + getGraphicsConfiguration()); if(!dockedPlaylist2 && owner.playlistDialog.isVisible()) - dockedPlaylist = Docker.dock(Settings.dockingd, p, new Rectangle(ow, - oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); + dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.playlistDialog.getBounds()); if(!dockedEqualizer2 && owner.equalizerDialog.isVisible()) - dockedEqualizer = Docker.dock(Settings.dockingd, p, new Rectangle( - ow, oh, getWidth(), getHeight()), - owner.equalizerDialog.getBounds()); + dockedEqualizer = Docker.dock(p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.equalizerDialog.getBounds()); ow = p.x; oh = p.y; if((dockedPlaylist2 || (dockedEqualizer2 && owner.equalizerDialog.dockedPlaylist2)) && owner.playlistDialog.isVisible()) { p = new Point(ow + ow2, oh + oh2); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow2, oh + - oh2, owner.playlistDialog.getWidth(), - owner.playlistDialog.getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); + Docker.dockScreen(p, new Rectangle(ow + ow2, oh + oh2, + owner.playlistDialog.getWidth(), + owner.playlistDialog.getHeight()), getGraphicsConfiguration()); ow = p.x - ow2; oh = p.y - oh2; } @@ -576,10 +573,9 @@ owner.equalizerDialog.dockedPlaylist2)) && owner.equalizerDialog.isVisible()) { p = new Point(ow + ow3, oh + oh3); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow3, oh + - oh3, owner.equalizerDialog.getWidth(), - owner.equalizerDialog.getHeight()), - getToolkit().getScreenInsets(getGraphicsConfiguration())); + Docker.dockScreen(p, new Rectangle(ow + ow3, oh + oh3, + owner.equalizerDialog.getWidth(), + owner.equalizerDialog.getHeight()), getGraphicsConfiguration()); ow = p.x - ow3; oh = p.y - oh3; } @@ -589,8 +585,8 @@ if(!owner.equalizerDialog.dockedPlaylist2 && owner.playlistDialog.isVisible() && owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = Docker.dock( - Settings.dockingd, p, new Rectangle(ow + ow2, oh + oh2, + owner.equalizerDialog.dockedPlaylist = Docker.dock(p, + new Rectangle(ow + ow2, oh + oh2, owner.playlistDialog.getWidth(), owner.playlistDialog.getHeight()), owner.equalizerDialog.getBounds()); @@ -605,8 +601,8 @@ if(!owner.equalizerDialog.dockedPlaylist2 && owner.playlistDialog.isVisible() && owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = Docker.dock( - Settings.dockingd, p, new Rectangle(ow + ow3, oh + oh3, + owner.equalizerDialog.dockedPlaylist = Docker.dock(p, + new Rectangle(ow + ow3, oh + oh3, owner.equalizerDialog.getWidth(), owner.equalizerDialog.getHeight()), owner.playlistDialog.getBounds()); Index: PlaylistDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlaylistDialog.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- PlaylistDialog.java 11 Apr 2006 06:49:26 -0000 1.27 +++ PlaylistDialog.java 11 Apr 2006 07:01:11 -0000 1.28 @@ -538,25 +538,23 @@ oh = getLocation().y; } Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); - owner.playDialog.dockedPlaylist = Docker.dock(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playDialog.getBounds()); + Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()), + getGraphicsConfiguration()); + owner.playDialog.dockedPlaylist = Docker.dock(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( - Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.equalizerDialog.getBounds()); + owner.equalizerDialog.dockedPlaylist = Docker.dock(p, + new Rectangle(ow, oh, getWidth(), getHeight()), + owner.equalizerDialog.getBounds()); ow = p.x; oh = p.y; } else - owner.equalizerDialog.dockedPlaylist = Docker.isDocked( - Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.equalizerDialog.getBounds()); + owner.equalizerDialog.dockedPlaylist = Docker.isDocked(p, + new Rectangle(ow, oh, getWidth(), getHeight()), + owner.equalizerDialog.getBounds()); setLocation(ow, oh); } Index: EqualizerDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- EqualizerDialog.java 11 Apr 2006 06:49:26 -0000 1.20 +++ EqualizerDialog.java 11 Apr 2006 07:01:11 -0000 1.21 @@ -196,26 +196,23 @@ oh = getLocation().y; } Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); + Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()), + getGraphicsConfiguration()); ow = p.x; oh = p.y; - owner.playDialog.dockedEqualizer = Docker.dock(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playDialog.getBounds()); + owner.playDialog.dockedEqualizer = Docker.dock(p, new Rectangle(ow, oh, + getWidth(), getHeight()), owner.playDialog.getBounds()); ow = p.x; oh = p.y; if(owner.playlistDialog.isVisible()) { - dockedPlaylist = Docker.dock(Settings.dockingd, p, new Rectangle(ow, - oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); + dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.playlistDialog.getBounds()); ow = p.x; oh = p.y; } else - dockedPlaylist = Docker.isDocked(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playlistDialog.getBounds()); + dockedPlaylist = Docker.isDocked(p, new Rectangle(ow, oh, + getWidth(), getHeight()), owner.playlistDialog.getBounds()); setLocation(ow, oh); } |
|
From: WiESi <wi...@us...> - 2006-04-11 06:49:30
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14450/src Modified Files: EqualizerDialog.java JavaAmp.java PlayDialog.java PlaylistDialog.java Log Message: Changes in window docking Index: PlayDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- PlayDialog.java 10 Apr 2006 17:51:30 -0000 1.18 +++ PlayDialog.java 11 Apr 2006 06:49:26 -0000 1.19 @@ -538,6 +538,8 @@ } public void dock(boolean moved) { + if(!Settings.docking) + return; if(!moved) { ow = getLocation().x; oh = getLocation().y; @@ -546,77 +548,72 @@ ow3 = owner.equalizerDialog.getLocation().x - ow; oh3 = owner.equalizerDialog.getLocation().y - oh; } - if(Settings.docking) { - Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), getToolkit().getScreenInsets( + Point p = new Point(ow, oh); + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, + getWidth(), getHeight()), getToolkit().getScreenInsets( + getGraphicsConfiguration())); + if(!dockedPlaylist2 && owner.playlistDialog.isVisible()) + dockedPlaylist = Docker.dock(Settings.dockingd, p, new Rectangle(ow, + oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); + if(!dockedEqualizer2 && owner.equalizerDialog.isVisible()) + dockedEqualizer = Docker.dock(Settings.dockingd, p, new Rectangle( + ow, oh, getWidth(), getHeight()), + owner.equalizerDialog.getBounds()); + ow = p.x; + oh = p.y; + if((dockedPlaylist2 || (dockedEqualizer2 && + owner.equalizerDialog.dockedPlaylist2)) && + owner.playlistDialog.isVisible()) { + p = new Point(ow + ow2, oh + oh2); + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow2, oh + + oh2, owner.playlistDialog.getWidth(), + owner.playlistDialog.getHeight()), getToolkit().getScreenInsets( getGraphicsConfiguration())); - if(!dockedPlaylist2 && owner.playlistDialog.isVisible()) - dockedPlaylist = Docker.dock(Settings.dockingd, p, new - Rectangle(ow, oh, getWidth(), getHeight()), - owner.playlistDialog.getBounds()); - if(!dockedEqualizer2 && owner.equalizerDialog.isVisible()) - dockedEqualizer = Docker.dock(Settings.dockingd, p, new - Rectangle(ow, oh, getWidth(), getHeight()), - owner.equalizerDialog.getBounds()); - ow = p.x; - oh = p.y; - if((dockedPlaylist2 || (dockedEqualizer2 && - owner.equalizerDialog.dockedPlaylist2)) && - owner.playlistDialog.isVisible()) { - p = new Point(ow + ow2, oh + oh2); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow2, - oh + oh2, owner.playlistDialog.getWidth(), + ow = p.x - ow2; + oh = p.y - oh2; + } + if((dockedEqualizer2 || (dockedPlaylist2 && + owner.equalizerDialog.dockedPlaylist2)) && + owner.equalizerDialog.isVisible()) { + p = new Point(ow + ow3, oh + oh3); + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow3, oh + + oh3, owner.equalizerDialog.getWidth(), + owner.equalizerDialog.getHeight()), + getToolkit().getScreenInsets(getGraphicsConfiguration())); + ow = p.x - ow3; + oh = p.y - oh3; + } + if(dockedPlaylist2 || (dockedEqualizer2 && + owner.equalizerDialog.dockedPlaylist2)) { + p = new Point(ow + ow2, oh + oh2); + if(!owner.equalizerDialog.dockedPlaylist2 && + owner.playlistDialog.isVisible() && + owner.equalizerDialog.isVisible()) { + owner.equalizerDialog.dockedPlaylist = Docker.dock( + Settings.dockingd, p, new Rectangle(ow + ow2, oh + oh2, + owner.playlistDialog.getWidth(), owner.playlistDialog.getHeight()), - getToolkit().getScreenInsets( - getGraphicsConfiguration())); + owner.equalizerDialog.getBounds()); ow = p.x - ow2; oh = p.y - oh2; } - if((dockedEqualizer2 || (dockedPlaylist2 && - owner.equalizerDialog.dockedPlaylist2)) && + owner.playlistDialog.setLocation(ow + ow2, oh + oh2); + } + if(dockedEqualizer2 || (dockedPlaylist2 && + owner.equalizerDialog.dockedPlaylist2)) { + p = new Point(ow + ow3, oh + oh3); + if(!owner.equalizerDialog.dockedPlaylist2 && + owner.playlistDialog.isVisible() && owner.equalizerDialog.isVisible()) { - p = new Point(ow + ow3, oh + oh3); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow3, - oh + oh3, owner.equalizerDialog.getWidth(), + owner.equalizerDialog.dockedPlaylist = Docker.dock( + Settings.dockingd, p, new Rectangle(ow + ow3, oh + oh3, + owner.equalizerDialog.getWidth(), owner.equalizerDialog.getHeight()), - getToolkit().getScreenInsets( - getGraphicsConfiguration())); + owner.playlistDialog.getBounds()); ow = p.x - ow3; oh = p.y - oh3; } - if(dockedPlaylist2 || (dockedEqualizer2 && - owner.equalizerDialog.dockedPlaylist2)) { - p = new Point(ow + ow2, oh + oh2); - if(!owner.equalizerDialog.dockedPlaylist2 && - owner.playlistDialog.isVisible() && - owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = - Docker.dock(Settings.dockingd, p, new Rectangle(ow + - ow2, oh + oh2, owner.playlistDialog.getWidth(), - owner.playlistDialog.getHeight()), - owner.equalizerDialog.getBounds()); - ow = p.x - ow2; - oh = p.y - oh2; - } - owner.playlistDialog.setLocation(ow + ow2, oh + oh2); - } - if(dockedEqualizer2 || (dockedPlaylist2 && - owner.equalizerDialog.dockedPlaylist2)) { - p = new Point(ow + ow3, oh + oh3); - if(!owner.equalizerDialog.dockedPlaylist2 && - owner.playlistDialog.isVisible() && - owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = - Docker.dock(Settings.dockingd, p, new Rectangle(ow + - ow3, oh + oh3, owner.equalizerDialog.getWidth(), - owner.equalizerDialog.getHeight()), - owner.playlistDialog.getBounds()); - ow = p.x - ow3; - oh = p.y - oh3; - } - owner.equalizerDialog.setLocation(ow + ow3, oh + oh3); - } + owner.equalizerDialog.setLocation(ow + ow3, oh + oh3); } setLocation(ow, oh); } Index: PlaylistDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlaylistDialog.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- PlaylistDialog.java 5 Apr 2006 20:22:05 -0000 1.26 +++ PlaylistDialog.java 11 Apr 2006 06:49:26 -0000 1.27 @@ -531,32 +531,32 @@ } public void dock(boolean moved) { + if(!Settings.docking) + return; if(!moved) { ow = getLocation().x; oh = getLocation().y; } - if(Settings.docking) { - Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); - owner.playDialog.dockedPlaylist = Docker.dock(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playDialog.getBounds()); + Point p = new Point(ow, oh); + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, + getWidth(), getHeight()), getToolkit().getScreenInsets( + getGraphicsConfiguration())); + owner.playDialog.dockedPlaylist = Docker.dock(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( + Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.equalizerDialog.getBounds()); ow = p.x; oh = p.y; - if(owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = Docker.dock( - Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.equalizerDialog.getBounds()); - ow = p.x; - oh = p.y; - } - else - owner.equalizerDialog.dockedPlaylist = Docker.isDocked( - Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.equalizerDialog.getBounds()); } + else + owner.equalizerDialog.dockedPlaylist = Docker.isDocked( + Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.equalizerDialog.getBounds()); setLocation(ow, oh); } Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- JavaAmp.java 10 Apr 2006 17:51:30 -0000 1.23 +++ JavaAmp.java 11 Apr 2006 06:49:26 -0000 1.24 @@ -9,7 +9,7 @@ private final static long serialVersionUID = 0; public final static String VERSION = "0.0.5 pre"; - public final static String DATE = "April 10 2006"; + public final static String DATE = "April 11 2006"; PlayDialog playDialog; PlaylistDialog playlistDialog; Index: EqualizerDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- EqualizerDialog.java 10 Apr 2006 17:51:30 -0000 1.19 +++ EqualizerDialog.java 11 Apr 2006 06:49:26 -0000 1.20 @@ -56,13 +56,7 @@ oh = getLocation().y; ow2 = owner.playlistDialog.getLocation().x - ow; oh2 = owner.playlistDialog.getLocation().y - oh; - if(e.getY() >= 12 || e.getX() <= 250) - ct = 1; - else if(my < 12) - if(mx > 262) - ct = 3; - else if(mx > 250) - ct = 2; + ct = 1; paint(getGraphics()); } @@ -72,30 +66,12 @@ owner.playDialog.dockedEqualizer; dockedPlaylist2 = dockedPlaylist; } - if(e.getButton() == MouseEvent.BUTTON1 && my < 12 && - e.getY() < 12) - if(ct == 3 && mx > 262 && e.getX() > 262) - System.exit(0); - else if(ct == 2 && mx > 250 && e.getX() > 250) - owner.setExtendedState(JFrame.ICONIFIED); ct = 0; paint(getGraphics()); } }); addMouseMotionListener(new MouseMotionAdapter() { public void mouseDragged(MouseEvent e) { - if(ct == 0 || ct == 2 || ct == 3) { - if(e.getY() >= 12) - ct = 0; - else if((ct == 0 || ct == 3) && mx > 262 && e.getX() > 262) - ct = 3; - else if((ct == 0 || ct == 2) && mx > 250 && mx <= 262 && - e.getX() > 250 && e.getX() <= 262) - ct = 2; - else - ct = 0; - paint(getGraphics()); - } if(ct != 1) return; ow += e.getX() - mx; @@ -213,34 +189,33 @@ } public void dock(boolean moved) { + if(!Settings.docking) + return; if(!moved) { ow = getLocation().x; oh = getLocation().y; } - if(Settings.docking) { - Point p = new Point(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( - Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.playDialog.getBounds()); + Point p = new Point(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(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(Settings.dockingd, p, new Rectangle(ow, + oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); ow = p.x; oh = p.y; - if(owner.playlistDialog.isVisible()) { - 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(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playlistDialog.getBounds()); } + else + dockedPlaylist = Docker.isDocked(Settings.dockingd, p, + new Rectangle(ow, oh, getWidth(), getHeight()), + owner.playlistDialog.getBounds()); setLocation(ow, oh); } |
|
From: WiESi <wi...@us...> - 2006-04-10 17:52:41
|
Update of /cvsroot/javaamp/javaamp/unstable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30492/unstable Modified Files: JavaAmp.jar Log Message: Built on 2006-04-10 Index: JavaAmp.jar =================================================================== RCS file: /cvsroot/javaamp/javaamp/unstable/JavaAmp.jar,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 Binary files /tmp/cvsWxHq5Y and /tmp/cvsNJ9gEh differ |
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29551/src Modified Files: EqualizerDialog.java FileInformationDialog.java JavaAmp.java JavaAmpSplash.java PlayDialog.java PreferencesDialog.java Settings.java Log Message: Index: EqualizerDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- EqualizerDialog.java 5 Apr 2006 20:22:05 -0000 1.18 +++ EqualizerDialog.java 10 Apr 2006 17:51:30 -0000 1.19 @@ -151,6 +151,7 @@ pomPresets.addSeparator(); menLoad = new JMenu(Language.get("LOAD")); meiLoadPreset = new JMenuItem(Language.get("PRESET")); + meiLoadPreset.setEnabled(false); menLoad.add(meiLoadPreset); meiLoadEQF = new JMenuItem(Language.get("LOAD_FROM_EQF")); meiLoadEQF.addActionListener(new ActionListener() { @@ -167,6 +168,7 @@ pomPresets.add(menLoad); menSave = new JMenu(Language.get("SAVE")); meiSavePreset = new JMenuItem(Language.get("PRESET")); + meiSavePreset.setEnabled(false); menSave.add(meiSavePreset); meiSaveEQF = new JMenuItem(Language.get("SAVE_TO_EQF")); meiSaveEQF.addActionListener(new ActionListener() { @@ -183,6 +185,7 @@ pomPresets.add(menSave); menDelete = new JMenu(Language.get("DELETE")); meiDeletePreset = new JMenuItem(Language.get("PRESET")); + meiDeletePreset.setEnabled(false); menDelete.add(meiDeletePreset); pomPresets.add(menDelete); btnPresets.addActionListener(new ActionListener() { Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Settings.java 10 Apr 2006 10:03:50 -0000 1.10 +++ Settings.java 10 Apr 2006 17:51:30 -0000 1.11 @@ -33,6 +33,9 @@ "Max" }; + static String[] availableDrivers; + static int[] availableDriversInds; + static String language; static boolean proxyEnabled; static String proxyHost; @@ -70,6 +73,21 @@ static int playlistDialogHeight; static { + try { + int num = FSound.FSOUND_GetNumDrivers(); + availableDrivers = new String[num + 1]; + availableDriversInds = new int[num + 1]; + availableDrivers[0] = "[Default]"; + availableDriversInds[0] = 0; + for(int i = 0; i < num; i++) { + availableDrivers[i + 1] = FSound.FSOUND_GetDriverName(i); + availableDriversInds[i + 1] = i; + } + } + catch(Exception e) { + availableDrivers = new String[] { "[Default]" }; + availableDriversInds = new int[] { 0 }; + } Properties p = new Properties(); try { p.load(new FileInputStream(new File(System.getProperty("user.dir"), @@ -166,6 +184,17 @@ return def; } + public final static int getIndexByValue(int value, int[] values, int def) { + try { + for(int i = 0; i < values.length; i++) + if(values[i] == value) + return i; + } + catch(Exception e) { + } + return def; + } + private final static String getStringByValue(int value, String[] keys, int[] values, String def) { try { Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- PreferencesDialog.java 10 Apr 2006 10:03:50 -0000 1.10 +++ PreferencesDialog.java 10 Apr 2006 17:51:30 -0000 1.11 @@ -77,11 +77,10 @@ JButton btnClose; - public PreferencesDialog(JavaAmp o) throws Exception { - super(o); + public PreferencesDialog(JavaAmp o) { + super(o, Language.get("PREFERENCES"), true); owner = o; - setTitle(Language.get("PREFERENCES")); setSize(585, 450); setResizable(false); setLocation((getToolkit().getScreenSize().width - getWidth()) / 2, @@ -271,18 +270,22 @@ chbSplash.setBounds(10, 145, 370, 20); panGenPref.add(chbSplash); chbUpdate = new JCheckBox(Language.get("CHECK_NEW")); + chbUpdate.setEnabled(false); chbUpdate.setBounds(10, 165, 370, 20); panGenPref.add(chbUpdate); lblShowIn = new JLabel(Language.get("SHOW_JAVAAMP_IN")); lblShowIn.setBounds(10, 185, 370, 20); panGenPref.add(lblShowIn); chbTaskbar = new JCheckBox(Language.get("TASKBAR")); + chbTaskbar.setEnabled(false); chbTaskbar.setBounds(30, 205, 350, 20); panGenPref.add(chbTaskbar); chbSysTray = new JCheckBox(Language.get("SYSTRAY")); + chbSysTray.setEnabled(false); chbSysTray.setBounds(30, 225, 350, 20); panGenPref.add(chbSysTray); chbScroll = new JCheckBox(Language.get("SCROLL_TITLE")); + chbScroll.setEnabled(false); chbScroll.setBounds(10, 245, 370, 20); panGenPref.add(chbScroll); @@ -312,25 +315,7 @@ cmbLookAndFeel.setBounds(100, 15, 280, 20); cmbLookAndFeel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - try { - for(UIManager.LookAndFeelInfo lnf : - UIManager.getInstalledLookAndFeels()) - if(lnf.getName().equalsIgnoreCase( - cmbLookAndFeel.getSelectedItem().toString())) { - UIManager.setLookAndFeel(lnf.getClassName()); - SwingUtilities.updateComponentTreeUI( - owner.playDialog); - SwingUtilities.updateComponentTreeUI( - owner.equalizerDialog); - SwingUtilities.updateComponentTreeUI( - owner.playlistDialog); - SwingUtilities.updateComponentTreeUI( - owner.preferencesDialog); - break; - } - } - catch(Exception ex) { - } + updateLookAndFeel(); } }); panAppearance.add(cmbLookAndFeel); @@ -420,7 +405,7 @@ lblDriver = new JLabel(Language.get("DRIVER")); lblDriver.setBounds(15, 140, 80, 20); panSoundOutput.add(lblDriver); - cmbDriver = new JComboBox(); + cmbDriver = new JComboBox(Settings.availableDrivers); cmbDriver.setBounds(95, 140, 285, 20); panSoundOutput.add(cmbDriver); @@ -443,6 +428,24 @@ makeVisible(panJavaAmp); } + public void updateLookAndFeel() { + try { + for(UIManager.LookAndFeelInfo lnf : + UIManager.getInstalledLookAndFeels()) + if(lnf.getName().equalsIgnoreCase( + cmbLookAndFeel.getSelectedItem().toString())) { + UIManager.setLookAndFeel(lnf.getClassName()); + SwingUtilities.updateComponentTreeUI(owner.playDialog); + SwingUtilities.updateComponentTreeUI(owner.equalizerDialog); + SwingUtilities.updateComponentTreeUI(owner.playlistDialog); + SwingUtilities.updateComponentTreeUI(this); + break; + } + } + catch(Exception e) { + } + } + public void makeVisible(JPanel pan) { panJavaAmp.setVisible(false); panGenPref.setVisible(false); @@ -476,7 +479,11 @@ sliMixRate.setValue(Settings.mixrate); sliMaxChannels.setValue(Settings.maxchannels); sliBufferSize.setValue(Settings.buffersize); - // TODO ... + cmbSpeakerMode.setSelectedIndex(Settings.getIndexByValue( + Settings.speakermode, Settings.SPEAKER_MODES_VALS, 4)); + cmbMixerType.setSelectedIndex(Settings.getIndexByValue( + Settings.mixertype, Settings.MIXER_TYPES_VALS, 0)); + cmbDriver.setSelectedItem(Settings.driver); setVisible(true); } @@ -505,7 +512,14 @@ Settings.mixrate = sliMixRate.getValue(); Settings.maxchannels = sliMaxChannels.getValue(); Settings.buffersize = sliBufferSize.getValue(); - // TODO ... + Settings.speakermode = Settings.SPEAKER_MODES_VALS[ + cmbSpeakerMode.getSelectedIndex()]; + Settings.mixertype = Settings.MIXER_TYPES_VALS[ + cmbMixerType.getSelectedIndex()]; + Settings.driver = Settings.availableDrivers[ + cmbDriver.getSelectedIndex()]; setVisible(false); + removeAll(); + dispose(); } } \ No newline at end of file Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- JavaAmp.java 10 Apr 2006 10:03:50 -0000 1.22 +++ JavaAmp.java 10 Apr 2006 17:51:30 -0000 1.23 @@ -14,7 +14,6 @@ PlayDialog playDialog; PlaylistDialog playlistDialog; EqualizerDialog equalizerDialog; - PreferencesDialog preferencesDialog; VisualizationBridge vb; @@ -56,7 +55,6 @@ Language.loadLanguage(getClass(), langs[0]); } - FMOD.create(); FSound.FSOUND_SetDriver(Settings.getDriver()); Settings.driver = FSound.FSOUND_GetDriverName( FSound.FSOUND_GetDriver()); @@ -67,6 +65,21 @@ FSound.FSOUND_SetSpeakerMode(Settings.speakermode); FSound.FSOUND_Init(Settings.mixrate, Settings.maxchannels, 0); FSound.FSOUND_DSP_SetActive(FSound.FSOUND_DSP_GetFFTUnit(), true); + if(Settings.proxyEnabled) { + StringBuilder proxy = new StringBuilder(); + if(Settings.proxyUser.length() > 0) { + proxy.append(Settings.proxyUser); + proxy.append(':'); + proxy.append(Settings.proxyPassword); + proxy.append('@'); + } + proxy.append(Settings.proxyHost); + if(Settings.proxyPort >= 0) { + proxy.append(':'); + proxy.append(Settings.proxyPort); + } + FSound.FSOUND_Stream_Net_SetProxy(proxy.toString()); + } fchChooser = new JFileChooser(); oppMessages = new JOptionPane(); @@ -77,12 +90,11 @@ setUndecorated(true); setSize(0, 0); setResizable(false); - setVisible(true); + setIconImage(GraphicsLoader.jaa1); playDialog = new PlayDialog(this); equalizerDialog = new EqualizerDialog(this); playlistDialog = new PlaylistDialog(this); - preferencesDialog = new PreferencesDialog(this); playDialog.setLocation(Settings.playDialogX, Settings.playDialogY); equalizerDialog.setLocation(Settings.equalizerDialogX, @@ -94,6 +106,7 @@ if(!GraphicsLoader.finishLoading()) throw new Exception(Language.get("ERROR_LOADING_GRAPHICS")); + setVisible(true); playDialog.setVisible(Settings.playDialogVisible); equalizerDialog.setVisible(Settings.equalizerDialogVisible); playlistDialog.setVisible(Settings.playlistDialogVisible); @@ -115,6 +128,12 @@ } public final static void main(String[] args) { + try { + FMOD.create(); + } + catch(Exception e) { + error(e); + } Toolkit.getDefaultToolkit().setDynamicLayout(false); System.setProperty("sun.awt.noerasebackground", "true"); JavaAmpSplash jasplash = null; @@ -125,37 +144,20 @@ } catch(Exception e) { } - try { - Class cls = Class.forName( - "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); - LookAndFeel lnf = (LookAndFeel)cls.newInstance(); - UIManager.installLookAndFeel(lnf.getName(), cls.getName()); - } - catch(Exception e) { - } - try { - Class cls = Class.forName( - "com.jgoodies.looks.plastic.PlasticLookAndFeel"); - LookAndFeel lnf = (LookAndFeel)cls.newInstance(); - UIManager.installLookAndFeel(lnf.getName(), cls.getName()); - } - catch(Exception e) { - } - try { - Class cls = Class.forName( - "com.jgoodies.looks.plastic.PlasticXPLookAndFeel"); - LookAndFeel lnf = (LookAndFeel)cls.newInstance(); - UIManager.installLookAndFeel(lnf.getName(), cls.getName()); - } - catch(Exception e) { - } - try { - Class cls = Class.forName( - "com.jgoodies.looks.windows.WindowsLookAndFeel"); - LookAndFeel lnf = (LookAndFeel)cls.newInstance(); - UIManager.installLookAndFeel(lnf.getName(), cls.getName()); - } - catch(Exception e) { + String[] lnfs = new String[] { + "com.jgoodies.looks.plastic.Plastic3DLookAndFeel", + "com.jgoodies.looks.plastic.PlasticLookAndFeel", + "com.jgoodies.looks.plastic.PlasticXPLookAndFeel", + "com.jgoodies.looks.windows.WindowsLookAndFeel" + }; + for(String str : lnfs) { + try { + Class cls = Class.forName(str); + UIManager.installLookAndFeel( + ((LookAndFeel)cls.newInstance()).getName(), cls.getName()); + } + catch(Exception e) { + } } try { UIManager.setLookAndFeel(Settings.lookAndFeel); Index: JavaAmpSplash.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmpSplash.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- JavaAmpSplash.java 26 Mar 2006 15:13:13 -0000 1.1 +++ JavaAmpSplash.java 10 Apr 2006 17:51:30 -0000 1.2 @@ -2,7 +2,7 @@ import java.awt.image.*; import java.util.*; -public class JavaAmpSplash extends Frame { +public class JavaAmpSplash extends Dialog { Image splash, offscreen; Graphics ofg; @@ -11,6 +11,7 @@ Timer timer; public JavaAmpSplash() throws Exception { + super(new Frame()); splash = getToolkit().getImage(getClass().getResource("jasplash.png")); MediaTracker mt = new MediaTracker(this); mt.addImage(splash, 0); Index: PlayDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- PlayDialog.java 8 Apr 2006 15:38:03 -0000 1.17 +++ PlayDialog.java 10 Apr 2006 17:51:30 -0000 1.18 @@ -639,7 +639,8 @@ } public void showPreferences() { - owner.preferencesDialog.open(); + PreferencesDialog pd = new PreferencesDialog(owner); + pd.open(); } public void paint(Graphics g) { Index: FileInformationDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/FileInformationDialog.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- FileInformationDialog.java 19 Mar 2006 10:17:39 -0000 1.9 +++ FileInformationDialog.java 10 Apr 2006 17:51:30 -0000 1.10 @@ -40,6 +40,7 @@ setResizable(false); setLocation((getToolkit().getScreenSize().width - getWidth()) / 2, (getToolkit().getScreenSize().height - getHeight()) / 2); + setDefaultCloseOperation(DISPOSE_ON_CLOSE); cntContainer = new Container(); cntContainer.setLayout(null); |
|
From: WiESi <wi...@us...> - 2006-04-10 14:53:05
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26034/src Modified Files: SimpleVisualization.java Log Message: SimpleVisualization appearance changed Index: SimpleVisualization.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/SimpleVisualization.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- SimpleVisualization.java 25 Mar 2006 06:51:45 -0000 1.6 +++ SimpleVisualization.java 10 Apr 2006 14:52:55 -0000 1.7 @@ -10,21 +10,46 @@ public class SimpleVisualization extends Visualization { Random rnd; - Spline splinex, spliney, splinez; Vector<float[]> points; float[][] old; float[] sum; - float camx, camy, camz, pi; + float camx, camy, camz, camx2, camy2, camz2, ccamx, ccamy, ccamz; + int c1c2; + final float[][][] flags = { + { // Austria + { 1.0f, 0.0f, 0.0f }, + { 1.0f, 1.0f, 1.0f }, + { 1.0f, 0.0f, 0.0f } + }, { // Germany + { 0.2f, 0.2f, 0.2f }, + { 1.0f, 0.0f, 0.0f }, + { 1.0f, 1.0f, 0.0f } + }, { // Italy + { 0.0f, 1.0f, 0.0f }, + { 1.0f, 1.0f, 1.0f }, + { 1.0f, 0.0f, 0.0f } + }, + }; + int flag, flag2, f1f2; + float[][] cf; public void init() { rnd = new Random(); points = new Vector<float[]>(); old = new float[300][30]; sum = new float[20]; - camx = rnd.nextFloat() * 60f; - camy = rnd.nextFloat() * 20; - camz = rnd.nextFloat() * 30f - 10f; + camx = rnd.nextFloat() * 80f - 10f; + camy = rnd.nextFloat() * 40f + 20f; + camz = rnd.nextFloat() * 150f - 10f; + camx2 = camx; + camy2 = camy; + camz2 = camz; + c1c2 = 0; delay = (long)10E6; + flag = rnd.nextInt(flags.length); + flag2 = flag; + f1f2 = 0; + cf = new float[3][3]; glClearColor(0, 0, 0, 1); glColor3f(1, 1, 1); @@ -41,7 +66,7 @@ glMatrixMode(GL_PROJECTION); glLoadIdentity(); gluPerspective(60, 800f / 600f, 0.1f, 1000f); - gluLookAt(camx, camy, camz, camx, 0, 200, 0, 1, 0); + gluLookAt(ccamx, ccamy, ccamz, 30, 0, 250, 0, 1, 0); glMatrixMode(GL_MODELVIEW); glPointSize(2); @@ -64,11 +89,16 @@ } for(int i = 0; i < 300; i++) { - glColor3f(0, 0.5f + (float)i / 598, 0); glBegin(GL_LINE_STRIP); + glColor3f(cf[2][0], cf[2][1], cf[2][2]); glVertex3f(-2, 0, i); - for(int j = 0; j < 30; j++) + for(int j = 0; j < 30; j++) { + if(j == 10) + glColor3f(cf[1][0], cf[1][1], cf[1][2]); + else if(j == 20) + glColor3f(cf[0][0], cf[0][1], cf[0][2]); glVertex3f(j * 2, old[i][j] * 20, i); + } glVertex3f(60, 0, i); glEnd(); } @@ -79,16 +109,16 @@ public void timer() { for(int i = 1; i < 300; i++) System.arraycopy(old[i], 0, old[i - 1], 0, 30); - for(int i = 0; i < 30; i++) - old[299][29 - i] = spectrum.get(i + 1); + for(int i = 1; i <= 30; i++) + old[299][30 - i] = spectrum.get(i); for(int i = 1; i < 20; i++) sum[i - 1] = sum[i]; sum[19] = 0; for(int i = 0; i < 30; i++) sum[19] += old[299][i]; - for(int i = 0; i < sum[19] * 10; i++) - points.add(new float[] { rnd.nextFloat() * 500 - 250, - rnd.nextFloat() * 400 - 200, 100 + rnd.nextFloat() * 200, + for(int i = 0; i < sum[19] * 5; i++) + points.add(new float[] { rnd.nextFloat() * 800 - 400, + rnd.nextFloat() * 800 - 400, 400 + rnd.nextFloat() * 200, 100 }); for(int i = 0; i < points.size(); i++) { float[] t = points.get(i); @@ -100,50 +130,56 @@ else points.set(i, t); } - if(splinex == null && rnd.nextInt(10) == 0) { - double[] xx = new double[5]; - double[] ff = new double[5]; - for(int i = 0; i < 5; i++) { - xx[i] = i; - if(i == 0) - ff[i] = camx; - else - ff[i] = rnd.nextDouble() * 60d; - } - splinex = new Spline(xx, ff); - - xx = new double[5]; - ff = new double[5]; - for(int i = 0; i < 5; i++) { - xx[i] = i; - if(i == 0) - ff[i] = camy; - else - ff[i] = rnd.nextDouble() * 20d; + if(f1f2 == 0 && rnd.nextInt(500) == 0) { + flag2 = rnd.nextInt(flags.length); + if(flag == flag2) + flag2 = rnd.nextInt(flags.length); + f1f2 = 1; + } + if(f1f2 > 0) { + f1f2++; + if(f1f2 == 100) { + flag = flag2; + f1f2 = 0; } - spliney = new Spline(xx, ff); - - xx = new double[5]; - ff = new double[5]; - for(int i = 0; i < 5; i++) { - xx[i] = i; - if(i == 0) - ff[i] = camz; - else - ff[i] = rnd.nextDouble() * 50d - 10d; + } + cf = new float[][] { + { + (flags[flag][0][0] * (100f - f1f2) + flags[flag2][0][0] * + f1f2) / 100f, (flags[flag][0][1] * (100f - f1f2) + + flags[flag2][0][1] * f1f2) / 100f, (flags[flag][0][2] * (100f - + f1f2) + flags[flag2][0][2] * f1f2) / 100f + }, { + (flags[flag][1][0] * (100f - f1f2) + flags[flag2][1][0] * + f1f2) / 100f, (flags[flag][1][1] * (100f - f1f2) + + flags[flag2][1][1] * f1f2) / 100f, (flags[flag][1][2] * (100f - + f1f2) + flags[flag2][1][2] * f1f2) / 100f + }, { + (flags[flag][2][0] * (100f - f1f2) + flags[flag2][2][0] * + f1f2) / 100f, (flags[flag][2][1] * (100f - f1f2) + + flags[flag2][2][1] * f1f2) / 100f, (flags[flag][2][2] * (100f - + f1f2) + flags[flag2][2][2] * f1f2) / 100f } - splinez = new Spline(xx, ff); - pi = 0; + }; + if(c1c2 == 0 && rnd.nextInt(500) == 0) { + camx2 = rnd.nextFloat() * 80f - 10f; + camy2 = rnd.nextFloat() * 40f + 20f; + camz2 = rnd.nextFloat() * 150f - 10f; + c1c2 = 1; } - if(splinex != null) { - pi += 0.001f; - if(pi > 4) - splinex = null; - else { - camx = (float)splinex.spline_value(pi); - camy = (float)spliney.spline_value(pi); - camz = (float)splinez.spline_value(pi); + if(c1c2 > 0) { + c1c2++; + if(c1c2 == 300) { + camx = camx2; + camy = camy2; + camz = camz2; + c1c2 = 0; } } + float fac = (float)(Math.pow(c1c2, 3) / 45000f - c1c2 * c1c2 / 100f + + 300f); + ccamx = (camx * fac + camx2 * (300f - fac)) / 300f; + ccamy = (camy * fac + camy2 * (300f - fac)) / 300f; + ccamz = (camz * fac + camz2 * (300f - fac)) / 300f; } } \ No newline at end of file |
|
From: WiESi <wi...@us...> - 2006-04-10 10:04:05
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9107/src Modified Files: JavaAmp.java Language.java PreferencesDialog.java Settings.java Log Message: Index: Language.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Language.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Language.java 9 Apr 2006 18:22:57 -0000 1.7 +++ Language.java 10 Apr 2006 10:03:50 -0000 1.8 @@ -20,6 +20,7 @@ english.put("ALLOW_MULTIPLE", "Allow multiple instances"); english.put("APPEARANCE", "Appearance"); english.put("BELOW_SPLINE", "Requested point below spline region"); + english.put("BUFFER_SIZE", "Buffer size:"); english.put("CANCEL", "Cancel"); english.put("CHECK_NEW", "Check for new versions at startup"); english.put("CLOSE", "Close"); @@ -28,6 +29,7 @@ english.put("DIRECTORY", "Directory"); english.put("DOCKING", "Enable window docking"); english.put("DOCKINGD", "Docking at (pixels):"); + english.put("DRIVER", "Driver:"); english.put("ENABLE_PROXY", "Enable proxy"); english.put("ENTER_URL", "Enter URL:"); english.put("EQF_FILES", "EQF files"); @@ -59,10 +61,13 @@ english.put("LOAD_PLAYLIST", "Load playlist"); english.put("LOADING_INFORMATIONS", "Loading file informations..."); english.put("LOOK_AND_FEEL", "Look and Feel:"); - english.put("MISCELLANEOUS", "Miscellaneous"); - english.put("MISCELLANEOUS_SHORT", "Msc"); english.put("M3U_FILES", "M3U files"); english.put("M3U_AND_PLS_FILES", "M3U and PLS files"); + english.put("MAX_CHANNELS", "Max. channels:"); + english.put("MISCELLANEOUS", "Miscellaneous"); + english.put("MISCELLANEOUS_SHORT", "Msc"); + english.put("MIX_RATE", "Mix rate:"); + english.put("MIXER_TYPE", "Mixer type:"); english.put("NEXT", "Next"); english.put("NOT_DELETED", "File cannot be deleted"); english.put("NOT_ENOUGH_POINTS_BUILD", "Not enough points to build spline"); @@ -110,6 +115,7 @@ english.put("SHOW_SPLASH", "Show splash screen"); english.put("SHUFFLE", "Shuffle"); english.put("SOUND_OUTPUT", "Sound output"); + english.put("SPEAKER_MODE", "Speaker mode:"); english.put("START_VISUALIZATION", "Start visualization"); english.put("STOP", "Stop"); english.put("SYSTRAY", "System tray"); Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- PreferencesDialog.java 9 Apr 2006 18:22:57 -0000 1.9 +++ PreferencesDialog.java 10 Apr 2006 10:03:50 -0000 1.10 @@ -58,6 +58,21 @@ JLabel lblDockingDPixels; JPanel panPlugins; JPanel panSoundOutput; + JLabel lblMixRate; + JSlider sliMixRate; + JLabel lblMixRateHz; + JLabel lblMaxChannels; + JSlider sliMaxChannels; + JLabel lblMaxChannelsChs; + JLabel lblBufferSize; + JSlider sliBufferSize; + JLabel lblBufferSizeMs; + JLabel lblSpeakerMode; + JComboBox cmbSpeakerMode; + JLabel lblMixerType; + JComboBox cmbMixerType; + JLabel lblDriver; + JComboBox cmbDriver; JPanel panVisualization; JButton btnClose; @@ -347,6 +362,67 @@ panSoundOutput.setBorder(BorderFactory.createTitledBorder( Language.get("PLUGINS") + " - " + Language.get("SOUND_OUTPUT"))); panSoundOutput.setBounds(170, 10, 395, 400); + lblMixRate = new JLabel(Language.get("MIX_RATE")); + lblMixRate.setBounds(15, 15, 80, 20); + panSoundOutput.add(lblMixRate); + sliMixRate = new JSlider(4000, 65535); + sliMixRate.setBounds(95, 15, 200, 20); + sliMixRate.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + lblMixRateHz.setText(sliMixRate.getValue() + " Hz"); + } + }); + panSoundOutput.add(sliMixRate); + lblMixRateHz = new JLabel(); + lblMixRateHz.setBounds(300, 15, 80, 20); + panSoundOutput.add(lblMixRateHz); + lblMaxChannels = new JLabel(Language.get("MAX_CHANNELS")); + lblMaxChannels.setBounds(15, 40, 80, 20); + panSoundOutput.add(lblMaxChannels); + sliMaxChannels = new JSlider(1, 1024); + sliMaxChannels.setBounds(95, 40, 200, 20); + sliMaxChannels.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + lblMaxChannelsChs.setText(Integer.toString( + sliMaxChannels.getValue())); + } + }); + panSoundOutput.add(sliMaxChannels); + lblMaxChannelsChs = new JLabel(); + lblMaxChannelsChs.setBounds(300, 40, 80, 20); + panSoundOutput.add(lblMaxChannelsChs); + lblBufferSize = new JLabel(Language.get("BUFFER_SIZE")); + lblBufferSize.setBounds(15, 65, 80, 20); + panSoundOutput.add(lblBufferSize); + sliBufferSize = new JSlider(50, 5000); + sliBufferSize.setBounds(95, 65, 200, 20); + sliBufferSize.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + lblBufferSizeMs.setText(sliBufferSize.getValue() + " ms"); + } + }); + panSoundOutput.add(sliBufferSize); + lblBufferSizeMs = new JLabel(); + lblBufferSizeMs.setBounds(300, 65, 80, 20); + panSoundOutput.add(lblBufferSizeMs); + lblSpeakerMode = new JLabel(Language.get("SPEAKER_MODE")); + lblSpeakerMode.setBounds(15, 90, 80, 20); + panSoundOutput.add(lblSpeakerMode); + cmbSpeakerMode = new JComboBox(Settings.SPEAKER_MODES_DESCS); + cmbSpeakerMode.setBounds(95, 90, 285, 20); + panSoundOutput.add(cmbSpeakerMode); + lblMixerType = new JLabel(Language.get("MIXER_TYPE")); + lblMixerType.setBounds(15, 115, 80, 20); + panSoundOutput.add(lblMixerType); + cmbMixerType = new JComboBox(Settings.MIXER_TYPES_DESCS); + cmbMixerType.setBounds(95, 115, 285, 20); + panSoundOutput.add(cmbMixerType); + lblDriver = new JLabel(Language.get("DRIVER")); + lblDriver.setBounds(15, 140, 80, 20); + panSoundOutput.add(lblDriver); + cmbDriver = new JComboBox(); + cmbDriver.setBounds(95, 140, 285, 20); + panSoundOutput.add(cmbDriver); panVisualization = new JPanel(null); panVisualization.setBorder(BorderFactory.createTitledBorder( @@ -397,6 +473,9 @@ cmbLookAndFeel.setSelectedItem(UIManager.getLookAndFeel().getName()); chbDocking.setSelected(Settings.docking); sliDockingD.setValue(Settings.dockingd); + sliMixRate.setValue(Settings.mixrate); + sliMaxChannels.setValue(Settings.maxchannels); + sliBufferSize.setValue(Settings.buffersize); // TODO ... setVisible(true); } @@ -423,6 +502,9 @@ Settings.lookAndFeel = UIManager.getLookAndFeel().getClass().getName(); Settings.docking = chbDocking.isSelected(); Settings.dockingd = sliDockingD.getValue(); + Settings.mixrate = sliMixRate.getValue(); + Settings.maxchannels = sliMaxChannels.getValue(); + Settings.buffersize = sliBufferSize.getValue(); // TODO ... setVisible(false); } Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- JavaAmp.java 9 Apr 2006 16:29:05 -0000 1.21 +++ JavaAmp.java 10 Apr 2006 10:03:50 -0000 1.22 @@ -9,7 +9,7 @@ private final static long serialVersionUID = 0; public final static String VERSION = "0.0.5 pre"; - public final static String DATE = "April 09 2006"; + public final static String DATE = "April 10 2006"; PlayDialog playDialog; PlaylistDialog playlistDialog; Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Settings.java 9 Apr 2006 18:22:57 -0000 1.9 +++ Settings.java 10 Apr 2006 10:03:50 -0000 1.10 @@ -5,30 +5,30 @@ public class Settings { - private final static String[] SPEAKER_MODES = new String[] { + final static String[] SPEAKER_MODES = new String[] { "DOLBYDIGITAL", "HEADPHONES", "MONO", "QUAD", "STEREO", "SURROUND" }; - private final static int[] SPEAKER_MODES_VALS = new int[] { + final static int[] SPEAKER_MODES_VALS = new int[] { FSound.FSOUND_SPEAKERMODE_DOLBYDIGITAL, FSound.FSOUND_SPEAKERMODE_HEADPHONES, FSound.FSOUND_SPEAKERMODE_MONO, FSound.FSOUND_SPEAKERMODE_QUAD, FSound.FSOUND_SPEAKERMODE_STEREO, FSound.FSOUND_SPEAKERMODE_SURROUND }; - private final static String[] SPEAKER_MODES_DESCS = new String[] { + final static String[] SPEAKER_MODES_DESCS = new String[] { "Dolby Digital", "Headphones", "Monaural", "Quadraphonic", "Stereo", "Surround Sound" }; - private final static String[] MIXER_TYPES = new String[] { + final static String[] MIXER_TYPES = new String[] { "QUALITY_AUTODETECT", "QUALITY_FPU", "QUALITY_MMXP5", "QUALITY_MMXP6", "MAX" }; - private final static int[] MIXER_TYPES_VALS = new int[] { + final static int[] MIXER_TYPES_VALS = new int[] { FSound.FSOUND_MIXER_QUALITY_AUTODETECT, FSound.FSOUND_MIXER_QUALITY_FPU, FSound.FSOUND_MIXER_QUALITY_MMXP5, FSound.FSOUND_MIXER_QUALITY_MMXP6, FSound.FSOUND_MIXER_MAX }; - private final static String[] MIXER_TYPES_DESCS = new String[] { + final static String[] MIXER_TYPES_DESCS = new String[] { "Quality autodetect", "Quality FPU", "Quality MMXP5", "Quality MMXP6", "Max" }; @@ -103,7 +103,7 @@ mixrate = 4000; else if(mixrate > 65535) mixrate = 65535; - maxchannels = getIntValue(p.get("MaxChannels"), 16); + maxchannels = getIntValue(p.get("MaxChannels"), 32); if(maxchannels < 1) maxchannels = 1; else if(maxchannels > 1024) |
|
From: WiESi <wi...@us...> - 2006-04-10 10:03:31
|
Update of /cvsroot/javaamp/javaamp/language In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8728/language Modified Files: english.ini german.ini Log Message: Index: german.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/german.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- german.ini 9 Apr 2006 16:29:38 -0000 1.4 +++ german.ini 10 Apr 2006 10:03:20 -0000 1.5 @@ -1,7 +1,7 @@ Language=German Author=Andreas Wiesbauer E-Mail=wi...@us... -Target=0.0.4 +Target=0.0.5 pre ABOVE_SPLINE=Gefragter Punkt über Spline-Bereich ACTIVATE_EQUALIZER=Equalizer aktivieren @@ -15,6 +15,7 @@ ALLOW_MULTIPLE=Erlaube mehrere Instanzen APPEARANCE=Erscheinung BELOW_SPLINE=Gefragter Punkt unter Spline-Bereich +BUFFER_SIZE=Puffer Größe: CANCEL=Abbrechen CHECK_NEW=Nach neuen Versionen suchen CLOSE=Schließen @@ -23,6 +24,7 @@ DIRECTORY=Verzeichnis DOCKING=Fensterandocken aktivieren DOCKINGD=Docken bei (Pixel): +DRIVER=Treiber: ENABLE_PROXY=Proxy aktivieren ENTER_URL=URL eingeben: EQF_FILES=EQF Dateien @@ -54,10 +56,13 @@ LOAD_PLAYLIST=Lade Playlist LOADING_INFORMATIONS=Lade Dateiinformationen... LOOK_AND_FEEL=Look and Feel: -MISCELLANEOUS=Sonstiges -MISCELLANEOUS_SHORT=Son M3U_FILES=M3U Dateien M3U_AND_PLS_FILES=M3U und PLS Dateien +MAX_CHANNELS=Max. Kanäle: +MISCELLANEOUS=Sonstiges +MISCELLANEOUS_SHORT=Son +MIX_RATE=Mix Rate: +MIXER_TYPE=Mixer Art: NEXT=Weiter NOT_DELETED=Datei kann nicht gelöscht werden NOT_ENOUGH_POINTS_BUILD=Nicht genügend Punkte zum Spline erstellen @@ -105,6 +110,7 @@ SHOW_SPLASH=Splash Screen zeigen SHUFFLE=Shuffle SOUND_OUTPUT=Soundausgabe +SPEAKER_MODE=Lautsprecher: START_VISUALIZATION=Visualisierung starten STOP=Stop SYSTRAY=System Tray Index: english.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/english.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- english.ini 9 Apr 2006 18:22:30 -0000 1.5 +++ english.ini 10 Apr 2006 10:03:20 -0000 1.6 @@ -1,7 +1,7 @@ Language=English Author=Andreas Wiesbauer E-Mail=wi...@us... -Target=0.0.4 +Target=0.0.5 pre ABOVE_SPLINE=Requested point above spline region ACTIVATE_EQUALIZER=Activate equalizer @@ -15,6 +15,7 @@ ALLOW_MULTIPLE=Allow multiple instances APPEARANCE=Appearance BELOW_SPLINE=Requested point below spline region +BUFFER_SIZE=Buffer size: CANCEL=Cancel CHECK_NEW=Check for new versions at startup CLOSE=Close @@ -23,6 +24,7 @@ DIRECTORY=Directory DOCKING=Enable window docking DOCKINGD=Docking at (pixels): +DRIVER=Driver: ENABLE_PROXY=Enable proxy ENTER_URL=Enter URL: EQF_FILES=EQF files @@ -54,10 +56,13 @@ LOAD_PLAYLIST=Load playlist LOADING_INFORMATIONS=Loading file informations... LOOK_AND_FEEL=Look and Feel: -MISCELLANEOUS=Miscellaneous -MISCELLANEOUS_SHORT=Msc M3U_FILES=M3U files M3U_AND_PLS_FILES=M3U and PLS files +MAX_CHANNELS=Max. channels: +MISCELLANEOUS=Miscellaneous +MISCELLANEOUS_SHORT=Msc +MIX_RATE=Mix rate: +MIXER_TYPE=Mixer type: NEXT=Next NOT_DELETED=File cannot be deleted NOT_ENOUGH_POINTS_BUILD=Not enough points to build spline @@ -105,6 +110,7 @@ SHOW_SPLASH=Show splash screen SHUFFLE=Shuffle SOUND_OUTPUT=Sound output +SPEAKER_MODE=Speaker mode: START_VISUALIZATION=Start visualization STOP=Stop SYSTRAY=System tray |
|
From: WiESi <wi...@us...> - 2006-04-09 18:24:54
|
Update of /cvsroot/javaamp/javaamp/unstable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27174/unstable Modified Files: JavaAmp.jar Log Message: Built on 2006-04-09 Index: JavaAmp.jar =================================================================== RCS file: /cvsroot/javaamp/javaamp/unstable/JavaAmp.jar,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 Binary files /tmp/cvsSuFNQh and /tmp/cvsr5lMJI differ |
|
From: WiESi <wi...@us...> - 2006-04-09 18:23:11
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25975/src Modified Files: Language.java PreferencesDialog.java Settings.java Log Message: Index: Language.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Language.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Language.java 9 Apr 2006 16:29:05 -0000 1.6 +++ Language.java 9 Apr 2006 18:22:57 -0000 1.7 @@ -27,7 +27,7 @@ english.put("DELETE", "Delete"); english.put("DIRECTORY", "Directory"); english.put("DOCKING", "Enable window docking"); - english.put("DOCKINGD", "Docking distance (pixels):"); + english.put("DOCKINGD", "Docking at (pixels):"); english.put("ENABLE_PROXY", "Enable proxy"); english.put("ENTER_URL", "Enter URL:"); english.put("EQF_FILES", "EQF files"); Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- PreferencesDialog.java 9 Apr 2006 16:29:05 -0000 1.8 +++ PreferencesDialog.java 9 Apr 2006 18:22:57 -0000 1.9 @@ -54,7 +54,8 @@ JComboBox cmbLookAndFeel; JCheckBox chbDocking; JLabel lblDockingD; - JTextField tfdDockingD; + JSlider sliDockingD; + JLabel lblDockingDPixels; JPanel panPlugins; JPanel panSoundOutput; JPanel panVisualization; @@ -286,7 +287,6 @@ panAppearance.setBorder(BorderFactory.createTitledBorder( Language.get("APPEARANCE"))); panAppearance.setBounds(170, 10, 395, 400); - lblLookAndFeel = new JLabel(Language.get("LOOK_AND_FEEL")); lblLookAndFeel.setBounds(10, 15, 90, 20); panAppearance.add(lblLookAndFeel); @@ -323,11 +323,20 @@ chbDocking.setBounds(10, 40, 370, 20); panAppearance.add(chbDocking); lblDockingD = new JLabel(Language.get("DOCKINGD")); - lblDockingD.setBounds(10, 65, 140, 20); + lblDockingD.setBounds(10, 65, 100, 20); panAppearance.add(lblDockingD); - tfdDockingD = new JTextField(); - tfdDockingD.setBounds(150, 65, 50, 20); - panAppearance.add(tfdDockingD); + sliDockingD = new JSlider(1, 50); + sliDockingD.setBounds(110, 65, 200, 20); + sliDockingD.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + lblDockingDPixels.setText(Integer.toString( + sliDockingD.getValue())); + } + }); + panAppearance.add(sliDockingD); + lblDockingDPixels = new JLabel(); + lblDockingDPixels.setBounds(320, 65, 60, 20); + panAppearance.add(lblDockingDPixels); panPlugins = new JPanel(null); panPlugins.setBorder(BorderFactory.createTitledBorder( @@ -387,7 +396,7 @@ chbScroll.setSelected(Settings.scrollTitle); cmbLookAndFeel.setSelectedItem(UIManager.getLookAndFeel().getName()); chbDocking.setSelected(Settings.docking); - tfdDockingD.setText(Integer.toString(Settings.dockingd)); + sliDockingD.setValue(Settings.dockingd); // TODO ... setVisible(true); } @@ -413,14 +422,7 @@ Settings.scrollTitle = chbScroll.isSelected(); Settings.lookAndFeel = UIManager.getLookAndFeel().getClass().getName(); Settings.docking = chbDocking.isSelected(); - try { - Settings.dockingd = Integer.parseInt(tfdDockingD.getText()); - if(Settings.dockingd < 0 || Settings.dockingd > 50) - Settings.dockingd = 10; - } - catch(Exception e) { - Settings.dockingd = 10; - } + Settings.dockingd = sliDockingD.getValue(); // TODO ... setVisible(false); } Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Settings.java 9 Apr 2006 16:29:05 -0000 1.8 +++ Settings.java 9 Apr 2006 18:22:57 -0000 1.9 @@ -94,8 +94,8 @@ "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); docking = getBooleanValue(p.get("Docking"), true); dockingd = getIntValue(p.get("DockingDistance"), 10); - if(dockingd < 0) - dockingd = 0; + if(dockingd < 1) + dockingd = 1; else if(dockingd > 50) dockingd = 50; mixrate = getIntValue(p.get("MixRate"), 44100); |
|
From: WiESi <wi...@us...> - 2006-04-09 18:22:37
|
Update of /cvsroot/javaamp/javaamp/language In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25792/language Modified Files: english.ini Log Message: Index: english.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/english.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- english.ini 9 Apr 2006 16:29:38 -0000 1.4 +++ english.ini 9 Apr 2006 18:22:30 -0000 1.5 @@ -22,7 +22,7 @@ DELETE=Delete DIRECTORY=Directory DOCKING=Enable window docking -DOCKINGD=Docking distance (pixels): +DOCKINGD=Docking at (pixels): ENABLE_PROXY=Enable proxy ENTER_URL=Enter URL: EQF_FILES=EQF files |
|
From: WiESi <wi...@us...> - 2006-04-09 16:29:52
|
Update of /cvsroot/javaamp/javaamp/language In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23354/language Modified Files: english.ini german.ini Log Message: Index: german.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/german.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- german.ini 8 Apr 2006 15:38:41 -0000 1.3 +++ german.ini 9 Apr 2006 16:29:38 -0000 1.4 @@ -71,6 +71,7 @@ OPEN=Öffnen OPEN_FILES=Datei(en) öffnen PAN=Balance +PASSWORD=Passwort: PAUSE=Pause PHYSICALLY=Physikalisch PLAY=Abspielen @@ -117,6 +118,7 @@ UNABLE_OPEN_HTML=Kann HTML Datei nicht öffnen URL=URL USED_TECHNOLOGIES=Verwendete Technologien: +USER=Benutzer: VALUE=Wert VISUALIZATION=Visualisierung VOLUME=Lautstärke \ No newline at end of file Index: english.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/english.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- english.ini 8 Apr 2006 15:38:41 -0000 1.3 +++ english.ini 9 Apr 2006 16:29:38 -0000 1.4 @@ -71,6 +71,7 @@ OPEN=Open OPEN_FILES=Open file(s) PAN=Balance +PASSWORD=Password: PAUSE=Pause PHYSICALLY=Physically PLAY=Play @@ -117,6 +118,7 @@ UNABLE_OPEN_HTML=Unable to open HTML file URL=URL USED_TECHNOLOGIES=Used technologies: +USER=User: VALUE=Value VISUALIZATION=Visualization VOLUME=Volume \ No newline at end of file |
|
From: WiESi <wi...@us...> - 2006-04-09 16:29:13
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22883/src Modified Files: JavaAmp.java Language.java PreferencesDialog.java Settings.java Log Message: Index: Language.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Language.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Language.java 8 Apr 2006 15:38:03 -0000 1.5 +++ Language.java 9 Apr 2006 16:29:05 -0000 1.6 @@ -76,6 +76,7 @@ english.put("OPEN", "Open"); english.put("OPEN_FILES", "Open file(s)"); english.put("PAN", "Balance"); + english.put("PASSWORD", "Password:"); english.put("PAUSE", "Pause"); english.put("PHYSICALLY", "Physically"); english.put("PLAY", "Play"); @@ -122,6 +123,7 @@ english.put("UNABLE_OPEN_HTML", "Unable to open HTML file"); english.put("URL", "URL"); english.put("USED_TECHNOLOGIES", "Used technologies:"); + english.put("USER", "User:"); english.put("VALUE", "Value"); english.put("VISUALIZATION", "Visualization"); english.put("VOLUME", "Volume"); Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- PreferencesDialog.java 8 Apr 2006 18:13:56 -0000 1.7 +++ PreferencesDialog.java 9 Apr 2006 16:29:05 -0000 1.8 @@ -37,8 +37,11 @@ JTextField tfdProxyHost; JLabel lblProxyPort; JTextField tfdProxyPort; + JLabel lblProxyUser; + JTextField tfdProxyUser; + JLabel lblProxyPassword; + JPasswordField pfdProxyPassword; JCheckBox chbSplash; - JCheckBox chbMultiple; JCheckBox chbUpdate; JLabel lblShowIn; JCheckBox chbTaskbar; @@ -130,7 +133,7 @@ }); trePreferences.setSelectionModel(dtsm); scpPreferences = new JScrollPane(trePreferences, - JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, + JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); scpPreferences.setBounds(10, 10, 150, 365); @@ -219,7 +222,7 @@ panInternet = new JPanel(null); panInternet.setBorder(BorderFactory.createTitledBorder( Language.get("INTERNET_SETTINGS"))); - panInternet.setBounds(10, 40, 375, 75); + panInternet.setBounds(10, 40, 375, 100); chbProxy = new JCheckBox(Language.get("ENABLE_PROXY")); chbProxy.setBounds(15, 15, 345, 20); panInternet.add(chbProxy); @@ -227,35 +230,44 @@ lblProxyHost.setBounds(15, 40, 70, 20); panInternet.add(lblProxyHost); tfdProxyHost = new JTextField(); - tfdProxyHost.setBounds(85, 40, 120, 20); + tfdProxyHost.setBounds(85, 40, 100, 20); panInternet.add(tfdProxyHost); lblProxyPort = new JLabel(Language.get("PROXY_PORT")); - lblProxyPort.setBounds(230, 40, 70, 20); + lblProxyPort.setBounds(190, 40, 70, 20); panInternet.add(lblProxyPort); tfdProxyPort = new JTextField(); - tfdProxyPort.setBounds(300, 40, 60, 20); + tfdProxyPort.setBounds(260, 40, 100, 20); panInternet.add(tfdProxyPort); + lblProxyUser = new JLabel(Language.get("USER")); + lblProxyUser.setBounds(15, 65, 70, 20); + panInternet.add(lblProxyUser); + tfdProxyUser = new JTextField(); + tfdProxyUser.setBounds(85, 65, 100, 20); + panInternet.add(tfdProxyUser); + lblProxyPassword = new JLabel(Language.get("PASSWORD")); + lblProxyPassword.setBounds(190, 65, 70, 20); + panInternet.add(lblProxyPassword); + pfdProxyPassword = new JPasswordField(); + pfdProxyPassword.setBounds(260, 65, 100, 20); + panInternet.add(pfdProxyPassword); panGenPref.add(panInternet); chbSplash = new JCheckBox(Language.get("SHOW_SPLASH")); - chbSplash.setBounds(10, 120, 370, 20); + chbSplash.setBounds(10, 145, 370, 20); panGenPref.add(chbSplash); - chbMultiple = new JCheckBox(Language.get("ALLOW_MULTIPLE")); - chbMultiple.setBounds(10, 140, 370, 20); - panGenPref.add(chbMultiple); chbUpdate = new JCheckBox(Language.get("CHECK_NEW")); - chbUpdate.setBounds(10, 160, 370, 20); + chbUpdate.setBounds(10, 165, 370, 20); panGenPref.add(chbUpdate); lblShowIn = new JLabel(Language.get("SHOW_JAVAAMP_IN")); - lblShowIn.setBounds(10, 180, 370, 20); + lblShowIn.setBounds(10, 185, 370, 20); panGenPref.add(lblShowIn); chbTaskbar = new JCheckBox(Language.get("TASKBAR")); - chbTaskbar.setBounds(30, 200, 350, 20); + chbTaskbar.setBounds(30, 205, 350, 20); panGenPref.add(chbTaskbar); chbSysTray = new JCheckBox(Language.get("SYSTRAY")); - chbSysTray.setBounds(30, 220, 350, 20); + chbSysTray.setBounds(30, 225, 350, 20); panGenPref.add(chbSysTray); chbScroll = new JCheckBox(Language.get("SCROLL_TITLE")); - chbScroll.setBounds(10, 240, 370, 20); + chbScroll.setBounds(10, 245, 370, 20); panGenPref.add(chbScroll); panPlaylist = new JPanel(null); @@ -366,8 +378,9 @@ tfdProxyPort.setText(Integer.toString(Settings.proxyPort)); else tfdProxyPort.setText(""); + tfdProxyUser.setText(Settings.proxyUser); + pfdProxyPassword.setText(Settings.proxyPassword); chbSplash.setSelected(Settings.splash); - chbMultiple.setSelected(Settings.multiple); chbUpdate.setSelected(Settings.update); chbTaskbar.setSelected(Settings.showInTaskbar); chbSysTray.setSelected(Settings.showInSysTray); @@ -391,8 +404,9 @@ catch(Exception e) { Settings.proxyPort = -1; } + Settings.proxyUser = tfdProxyUser.getText(); + Settings.proxyPassword = new String(pfdProxyPassword.getPassword()); Settings.splash = chbSplash.isSelected(); - Settings.multiple = chbMultiple.isSelected(); Settings.update = chbUpdate.isSelected(); Settings.showInTaskbar = chbTaskbar.isSelected(); Settings.showInSysTray = chbSysTray.isSelected(); Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- JavaAmp.java 8 Apr 2006 18:13:56 -0000 1.20 +++ JavaAmp.java 9 Apr 2006 16:29:05 -0000 1.21 @@ -1,4 +1,5 @@ import java.awt.*; +import java.io.*; import java.util.*; import javax.swing.*; import org.lwjgl.*; @@ -8,7 +9,7 @@ private final static long serialVersionUID = 0; public final static String VERSION = "0.0.5 pre"; - public final static String DATE = "Apr 08 2006"; + public final static String DATE = "April 09 2006"; PlayDialog playDialog; PlaylistDialog playlistDialog; @@ -22,6 +23,8 @@ Random random; public JavaAmp() throws Exception { + GraphicsLoader.startLoading(this); + Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { try { @@ -53,8 +56,6 @@ Language.loadLanguage(getClass(), langs[0]); } - GraphicsLoader.startLoading(this); - FMOD.create(); FSound.FSOUND_SetDriver(Settings.getDriver()); Settings.driver = FSound.FSOUND_GetDriverName( @@ -99,27 +100,17 @@ } public final static void error(Exception e) { + ByteArrayOutputStream str = new ByteArrayOutputStream(); e.printStackTrace(); - StringBuilder str = new StringBuilder(e.toString()); - str.append('\n'); - for(int i = 0; i < e.getStackTrace().length; i++) { - str.append(" at "); - str.append(e.getStackTrace()[i]); - str.append('\n'); - } + e.printStackTrace(new PrintStream(str)); Sys.alert("JavaAmp: Error", str.toString()); System.exit(1); } public final static void warning(Exception e) { + ByteArrayOutputStream str = new ByteArrayOutputStream(); e.printStackTrace(); - StringBuilder str = new StringBuilder(e.toString()); - str.append('\n'); - for(int i = 0; i < e.getStackTrace().length; i++) { - str.append(" at "); - str.append(e.getStackTrace()[i]); - str.append('\n'); - } + e.printStackTrace(new PrintStream(str)); Sys.alert("JavaAmp: Warning", str.toString()); } Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Settings.java 8 Apr 2006 18:13:56 -0000 1.7 +++ Settings.java 9 Apr 2006 16:29:05 -0000 1.8 @@ -37,8 +37,9 @@ static boolean proxyEnabled; static String proxyHost; static int proxyPort; + static String proxyUser; + static String proxyPassword; static boolean splash; - static boolean multiple; static boolean update; static boolean showInTaskbar; static boolean showInSysTray; @@ -82,8 +83,9 @@ proxyPort = getIntValue(p.get("ProxyPort"), -1); if(proxyPort < 0 || proxyPort > 65535) proxyPort = -1; + proxyUser = getStringValue(p.get("ProxyUser"), ""); + proxyPassword = getStringValue(p.get("ProxyPassword"), ""); splash = getBooleanValue(p.get("Splash"), true); - multiple = getBooleanValue(p.get("Multiple"), true); update = getBooleanValue(p.get("Update"), true); showInTaskbar = getBooleanValue(p.get("ShowInTaskbar"), true); showInSysTray = getBooleanValue(p.get("ShowInSysTray"), false); @@ -201,8 +203,9 @@ p.put("ProxyEnable", Boolean.toString(proxyEnabled)); p.put("ProxyHost", proxyHost); p.put("ProxyPort", Integer.toString(proxyPort)); + p.put("ProxyUser", proxyUser); + p.put("ProxyPassword", proxyPassword); 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)); @@ -216,7 +219,7 @@ p.put("SpeakerMode", getStringByValue(speakermode, SPEAKER_MODES, SPEAKER_MODES_VALS, "STEREO")); p.put("MixerType", getStringByValue(mixertype, MIXER_TYPES, - MIXER_TYPES_VALS, "AUTODETECT")); + MIXER_TYPES_VALS, "QUALITY_AUTODETECT")); p.put("Driver", driver); p.put("PlayDialogVisible", Boolean.toString(playDialogVisible)); p.put("PlayDialogX", Integer.toString(playDialogX)); |
|
From: WiESi <wi...@us...> - 2006-04-08 18:16:06
|
Update of /cvsroot/javaamp/javaamp/unstable In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8556/unstable Modified Files: JavaAmp.jar Log Message: Built on 2006-04-08 Index: JavaAmp.jar =================================================================== RCS file: /cvsroot/javaamp/javaamp/unstable/JavaAmp.jar,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 Binary files /tmp/cvsp4wtwJ and /tmp/cvsVQ8UOU differ |
|
From: WiESi <wi...@us...> - 2006-04-08 18:14:05
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7183/src Modified Files: JavaAmp.java PreferencesDialog.java Settings.java Log Message: Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- PreferencesDialog.java 8 Apr 2006 15:38:03 -0000 1.6 +++ PreferencesDialog.java 8 Apr 2006 18:13:56 -0000 1.7 @@ -372,9 +372,10 @@ chbTaskbar.setSelected(Settings.showInTaskbar); chbSysTray.setSelected(Settings.showInSysTray); chbScroll.setSelected(Settings.scrollTitle); - //Settings.docking = ... - //Settings.dockingd = ... - //... + cmbLookAndFeel.setSelectedItem(UIManager.getLookAndFeel().getName()); + chbDocking.setSelected(Settings.docking); + tfdDockingD.setText(Integer.toString(Settings.dockingd)); + // TODO ... setVisible(true); } @@ -384,10 +385,8 @@ Settings.proxyHost = tfdProxyHost.getText(); try { Settings.proxyPort = Integer.parseInt(tfdProxyPort.getText()); - if(Settings.proxyPort < 0) - Settings.proxyPort = 0; - else if(Settings.proxyPort > 65535) - Settings.proxyPort = 65535; + if(Settings.proxyPort < 0 || Settings.proxyPort > 65535) + Settings.proxyPort = -1; } catch(Exception e) { Settings.proxyPort = -1; @@ -398,9 +397,17 @@ Settings.showInTaskbar = chbTaskbar.isSelected(); Settings.showInSysTray = chbSysTray.isSelected(); Settings.scrollTitle = chbScroll.isSelected(); - //Settings.docking = ... - //Settings.dockingd = ... - //... + Settings.lookAndFeel = UIManager.getLookAndFeel().getClass().getName(); + Settings.docking = chbDocking.isSelected(); + try { + Settings.dockingd = Integer.parseInt(tfdDockingD.getText()); + if(Settings.dockingd < 0 || Settings.dockingd > 50) + Settings.dockingd = 10; + } + catch(Exception e) { + Settings.dockingd = 10; + } + // TODO ... setVisible(false); } } \ No newline at end of file Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- JavaAmp.java 8 Apr 2006 15:38:03 -0000 1.19 +++ JavaAmp.java 8 Apr 2006 18:13:56 -0000 1.20 @@ -56,10 +56,14 @@ GraphicsLoader.startLoading(this); FMOD.create(); + FSound.FSOUND_SetDriver(Settings.getDriver()); + Settings.driver = FSound.FSOUND_GetDriverName( + FSound.FSOUND_GetDriver()); + if(Settings.driver == null) + Settings.driver = ""; FSound.FSOUND_SetMixer(Settings.mixertype); FSound.FSOUND_SetBufferSize(Settings.buffersize); FSound.FSOUND_SetSpeakerMode(Settings.speakermode); - FSound.FSOUND_SetDriver(Settings.getDriver()); FSound.FSOUND_Init(Settings.mixrate, Settings.maxchannels, 0); FSound.FSOUND_DSP_SetActive(FSound.FSOUND_DSP_GetFFTUnit(), true); @@ -163,10 +167,11 @@ catch(Exception e) { } try { - UIManager.setLookAndFeel( - "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); + UIManager.setLookAndFeel(Settings.lookAndFeel); } catch(Exception e) { + Settings.lookAndFeel = + UIManager.getLookAndFeel().getClass().getName(); } try { new JavaAmp(); Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Settings.java 8 Apr 2006 15:38:03 -0000 1.6 +++ Settings.java 8 Apr 2006 18:13:56 -0000 1.7 @@ -6,28 +6,32 @@ public class Settings { private final static String[] SPEAKER_MODES = new String[] { - "DOLBYDIGITAL", "HEADPHONES", "MONO", "QUAD", "STEREO", "SURROUND", - "DTS", "PROLOGIC2", "PROLOGIC2_INTERIOR" + "DOLBYDIGITAL", "HEADPHONES", "MONO", "QUAD", "STEREO", "SURROUND" }; private final static int[] SPEAKER_MODES_VALS = new int[] { FSound.FSOUND_SPEAKERMODE_DOLBYDIGITAL, FSound.FSOUND_SPEAKERMODE_HEADPHONES, FSound.FSOUND_SPEAKERMODE_MONO, FSound.FSOUND_SPEAKERMODE_QUAD, FSound.FSOUND_SPEAKERMODE_STEREO, - FSound.FSOUND_SPEAKERMODE_SURROUND, FSound.FSOUND_SPEAKERMODE_DTS, - FSound.FSOUND_SPEAKERMODE_PROLOGIC2, - FSound.FSOUND_SPEAKERMODE_PROLOGIC2_INTERIOR + FSound.FSOUND_SPEAKERMODE_SURROUND + }; + private final static String[] SPEAKER_MODES_DESCS = new String[] { + "Dolby Digital", "Headphones", "Monaural", "Quadraphonic", "Stereo", + "Surround Sound" }; private final static String[] MIXER_TYPES = new String[] { - "AUTODETECT", "QUALITY_AUTODETECT", "QUALITY_MMXP5", "QUALITY_MMXP6", - "MONO", "QUALITY_MONO", "MAX" + "QUALITY_AUTODETECT", "QUALITY_FPU", "QUALITY_MMXP5", "QUALITY_MMXP6", + "MAX" }; private final static int[] MIXER_TYPES_VALS = new int[] { - FSound.FSOUND_MIXER_AUTODETECT, FSound.FSOUND_MIXER_QUALITY_AUTODETECT, + FSound.FSOUND_MIXER_QUALITY_AUTODETECT, FSound.FSOUND_MIXER_QUALITY_FPU, FSound.FSOUND_MIXER_QUALITY_MMXP5, FSound.FSOUND_MIXER_QUALITY_MMXP6, - FSound.FSOUND_MIXER_MONO, FSound.FSOUND_MIXER_QUALITY_MONO, FSound.FSOUND_MIXER_MAX }; + private final static String[] MIXER_TYPES_DESCS = new String[] { + "Quality autodetect", "Quality FPU", "Quality MMXP5", "Quality MMXP6", + "Max" + }; static String language; static boolean proxyEnabled; @@ -39,6 +43,7 @@ static boolean showInTaskbar; static boolean showInSysTray; static boolean scrollTitle; + static String lookAndFeel; static boolean docking; static int dockingd; @@ -83,6 +88,8 @@ showInTaskbar = getBooleanValue(p.get("ShowInTaskbar"), true); showInSysTray = getBooleanValue(p.get("ShowInSysTray"), false); scrollTitle = getBooleanValue(p.get("ScrollTitle"), false); + lookAndFeel = getStringValue(p.get("LookAndFeel"), + "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); docking = getBooleanValue(p.get("Docking"), true); dockingd = getIntValue(p.get("DockingDistance"), 10); if(dockingd < 0) @@ -107,7 +114,7 @@ speakermode = getValueByString(p.get("SpeakerMode"), SPEAKER_MODES, SPEAKER_MODES_VALS, FSound.FSOUND_SPEAKERMODE_STEREO); mixertype = getValueByString(p.get("MixerType"), MIXER_TYPES, - MIXER_TYPES_VALS, FSound.FSOUND_MIXER_AUTODETECT); + MIXER_TYPES_VALS, FSound.FSOUND_MIXER_QUALITY_AUTODETECT); driver = getStringValue(p.get("Driver"), ""); int x = (Toolkit.getDefaultToolkit().getScreenSize().width - 275) / 2; int y = (Toolkit.getDefaultToolkit().getScreenSize().height - 345) / 2; @@ -200,6 +207,7 @@ p.put("ShowInTaskbar", Boolean.toString(showInTaskbar)); p.put("ShowInSysTray", Boolean.toString(showInSysTray)); p.put("ScrollTitle", Boolean.toString(scrollTitle)); + p.put("LookAndFeel", lookAndFeel); p.put("Docking", Boolean.toString(docking)); p.put("DockingDistance", Integer.toString(dockingd)); p.put("MixRate", Integer.toString(mixrate)); |
|
From: WiESi <wi...@us...> - 2006-04-08 15:39:27
|
Update of /cvsroot/javaamp/javaamp/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7629/res Modified Files: opengl.png Log Message: Index: opengl.png =================================================================== RCS file: /cvsroot/javaamp/javaamp/res/opengl.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsqTFMgZ and /tmp/cvsC3HZz0 differ |
|
From: WiESi <wi...@us...> - 2006-04-08 15:38:51
|
Update of /cvsroot/javaamp/javaamp/language In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7154/language Modified Files: english.ini german.ini Log Message: Index: german.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/german.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- german.ini 5 Apr 2006 20:19:50 -0000 1.2 +++ german.ini 8 Apr 2006 15:38:41 -0000 1.3 @@ -108,7 +108,6 @@ STOP=Stop SYSTRAY=System Tray TASKBAR=Taskbar -THEME=Thema: TITLES=Titel TRACK_ID=Track ID UNDEFINED=Undefiniert @@ -117,6 +116,7 @@ UNKNOWN_FILE_EXCEPTION=Unbekannter Dateifehler UNABLE_OPEN_HTML=Kann HTML Datei nicht öffnen URL=URL +USED_TECHNOLOGIES=Verwendete Technologien: VALUE=Wert VISUALIZATION=Visualisierung VOLUME=Lautstärke \ No newline at end of file Index: english.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/english.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- english.ini 5 Apr 2006 20:19:50 -0000 1.2 +++ english.ini 8 Apr 2006 15:38:41 -0000 1.3 @@ -108,7 +108,6 @@ STOP=Stop SYSTRAY=System tray TASKBAR=Taskbar -THEME=Theme: TITLES=Titles TRACK_ID=Track ID UNDEFINED=Undefined @@ -117,6 +116,7 @@ UNKNOWN_FILE_EXCEPTION=Unknown file exception UNABLE_OPEN_HTML=Unable to open HTML file URL=URL +USED_TECHNOLOGIES=Used technologies: VALUE=Value VISUALIZATION=Visualization VOLUME=Volume \ No newline at end of file |
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) { |
|
From: WiESi <wi...@us...> - 2006-04-05 20:22:29
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3732/src Modified Files: EQLabel.java EqualizerDialog.java JavaAmp.java Language.java PlayDialog.java PlaylistDialog.java PreferencesDialog.java Settings.java SongInfoLabel.java Log Message: Index: Language.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Language.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Language.java 26 Mar 2006 16:20:54 -0000 1.3 +++ Language.java 5 Apr 2006 20:22:05 -0000 1.4 @@ -26,6 +26,8 @@ english.put("CENTER", "Center"); english.put("DELETE", "Delete"); english.put("DIRECTORY", "Directory"); + english.put("DOCKING", "Enable window docking"); + english.put("DOCKINGD", "Docking distance (pixels):"); english.put("ENABLE_PROXY", "Enable proxy"); english.put("ENTER_URL", "Enter URL:"); english.put("EQF_FILES", "EQF files"); @@ -56,6 +58,7 @@ english.put("LOAD_INFORMATIONS_UNEXACTLY", "Load informations (unexactly)"); english.put("LOAD_PLAYLIST", "Load playlist"); english.put("LOADING_INFORMATIONS", "Loading file informations..."); + english.put("LOOK_AND_FEEL", "Look and Feel:"); english.put("MISCELLANEOUS", "Miscellaneous"); english.put("MISCELLANEOUS_SHORT", "Msc"); english.put("M3U_FILES", "M3U files"); @@ -105,10 +108,12 @@ english.put("SHOW_PLAYLIST", "Show playlist"); english.put("SHOW_SPLASH", "Show splash screen"); english.put("SHUFFLE", "Shuffle"); + english.put("SOUND_OUTPUT", "Sound output"); english.put("START_VISUALIZATION", "Start visualization"); 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"); Index: EqualizerDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- EqualizerDialog.java 26 Mar 2006 11:18:05 -0000 1.17 +++ EqualizerDialog.java 5 Apr 2006 20:22:05 -0000 1.18 @@ -100,31 +100,7 @@ return; ow += e.getX() - mx; oh += e.getY() - my; - if(Settings.docking) { - Point p = new Point(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( - 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(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playlistDialog.getBounds()); - ow = p.x; - oh = p.y; - } - else - dockedPlaylist = Docker.isDocked(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playlistDialog.getBounds()); - } - setLocation(ow, oh); + dock(true); } }); @@ -233,6 +209,43 @@ setContentPane(cntContainer); } + public void dock(boolean moved) { + if(!moved) { + ow = getLocation().x; + oh = getLocation().y; + } + if(Settings.docking) { + Point p = new Point(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( + 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(Settings.dockingd, p, + new Rectangle(ow, oh, getWidth(), getHeight()), + owner.playlistDialog.getBounds()); + ow = p.x; + oh = p.y; + } + else + dockedPlaylist = Docker.isDocked(Settings.dockingd, p, + new Rectangle(ow, oh, getWidth(), getHeight()), + owner.playlistDialog.getBounds()); + } + setLocation(ow, oh); + } + + public void setVisible(boolean b) { + super.setVisible(b); + dock(false); + } + public void loadPreset() throws Exception { owner.fchChooser.setMultiSelectionEnabled(false); owner.fchChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); Index: SongInfoLabel.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/SongInfoLabel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- SongInfoLabel.java 7 Mar 2006 16:13:18 -0000 1.7 +++ SongInfoLabel.java 5 Apr 2006 20:22:05 -0000 1.8 @@ -24,7 +24,7 @@ xt = 4; text2 = ""; - setText("JavaAmp 0.0.4"); + setText("JavaAmp " + JavaAmp.VERSION); setBorder(new BevelBorder(BevelBorder.LOWERED)); setFont(new Font("Dialog", Font.PLAIN, 10)); setCursor(Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR)); Index: PreferencesDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PreferencesDialog.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- PreferencesDialog.java 25 Mar 2006 10:35:19 -0000 1.4 +++ PreferencesDialog.java 5 Apr 2006 20:22:05 -0000 1.5 @@ -19,6 +19,7 @@ DefaultMutableTreeNode mtnTitles; DefaultMutableTreeNode mtnAppearance; DefaultMutableTreeNode mtnPlugins; + DefaultMutableTreeNode mtnSoundOutput; DefaultMutableTreeNode mtnVisualization; JPanel panJavaAmp; @@ -34,7 +35,7 @@ JLabel lblProxyHost; JTextField tfdProxyHost; JLabel lblProxyPort; - JTextField tfdPort; + JTextField tfdProxyPort; JCheckBox chbSplash; JCheckBox chbMultiple; JCheckBox chbUpdate; @@ -44,8 +45,16 @@ JCheckBox chbScroll; JPanel panPlaylist; JPanel panTitles; - JPanel panApperance; + JPanel panAppearance; + JLabel lblLookAndFeel; + JComboBox cmbLookAndFeel; + JLabel lblTheme; + JComboBox cmbTheme; + JCheckBox chbDocking; + JLabel lblDockingD; + JTextField tfdDockingD; JPanel panPlugins; + JPanel panSoundOutput; JPanel panVisualization; JButton btnClose; @@ -60,7 +69,12 @@ setLocation((getToolkit().getScreenSize().width - getWidth()) / 2, (getToolkit().getScreenSize().height - getHeight()) / 2); setLayout(null); - setDefaultCloseOperation(HIDE_ON_CLOSE); + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent e) { + closing(); + } + }); DefaultMutableTreeNode root = new DefaultMutableTreeNode(); mtnJavaAmp = new DefaultMutableTreeNode("JavaAmp"); @@ -77,6 +91,9 @@ "APPEARANCE")); root.add(mtnAppearance); mtnPlugins = new DefaultMutableTreeNode(Language.get("PLUGINS")); + mtnSoundOutput = new DefaultMutableTreeNode(Language.get( + "SOUND_OUTPUT")); + mtnPlugins.add(mtnSoundOutput); mtnVisualization = new DefaultMutableTreeNode(Language.get( "VISUALIZATION")); mtnPlugins.add(mtnVisualization); @@ -101,10 +118,13 @@ makeVisible(panTitles); else if(e.getPath().equals(new TreePath( mtnAppearance.getPath()))) - makeVisible(panApperance); + makeVisible(panAppearance); else if(e.getPath().equals(new TreePath(mtnPlugins.getPath()))) makeVisible(panPlugins); else if(e.getPath().equals(new TreePath( + mtnSoundOutput.getPath()))) + makeVisible(panSoundOutput); + else if(e.getPath().equals(new TreePath( mtnVisualization.getPath()))) makeVisible(panVisualization); } @@ -120,7 +140,7 @@ btnClose.setBounds(10, 385, 150, 25); btnClose.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - setVisible(false); + closing(); } }); @@ -165,7 +185,7 @@ Sys.openURL("http://www.opengl.org/"); } }); - lblOpenGl.setBounds(15, 85, 88, 39); + lblOpenGl.setBounds(15, 85, 88, 31); panJavaAmp.add(lblOpenGl); panGenPref = new JPanel(null); @@ -211,9 +231,9 @@ lblProxyPort = new JLabel(Language.get("PROXY_PORT")); lblProxyPort.setBounds(230, 40, 70, 20); panInternet.add(lblProxyPort); - tfdPort = new JTextField(); - tfdPort.setBounds(300, 40, 60, 20); - panInternet.add(tfdPort); + tfdProxyPort = new JTextField(); + tfdProxyPort.setBounds(300, 40, 60, 20); + panInternet.add(tfdProxyPort); panGenPref.add(panInternet); chbSplash = new JCheckBox(Language.get("SHOW_SPLASH")); chbSplash.setBounds(10, 120, 370, 20); @@ -239,30 +259,82 @@ panPlaylist = new JPanel(null); panPlaylist.setBorder(BorderFactory.createTitledBorder( - Language.get("GENERAL_PREFERENCES") + " - " + - Language.get("PLAYLIST"))); + Language.get("GENERAL_PREFERENCES") + " - " + Language.get( + "PLAYLIST"))); panPlaylist.setBounds(170, 10, 395, 400); panTitles = new JPanel(null); panTitles.setBorder(BorderFactory.createTitledBorder( - Language.get("GENERAL_PREFERENCES") + " - " + - Language.get("TITLES"))); + Language.get("GENERAL_PREFERENCES") + " - " + Language.get( + "TITLES"))); panTitles.setBounds(170, 10, 395, 400); - panApperance = new JPanel(null); - panApperance.setBorder(BorderFactory.createTitledBorder( + panAppearance = new JPanel(null); + panAppearance.setBorder(BorderFactory.createTitledBorder( Language.get("APPEARANCE"))); - panApperance.setBounds(170, 10, 395, 400); + panAppearance.setBounds(170, 10, 395, 400); + + lblLookAndFeel = new JLabel(Language.get("LOOK_AND_FEEL")); + lblLookAndFeel.setBounds(10, 15, 90, 20); + panAppearance.add(lblLookAndFeel); + String[] lnfs = new String[UIManager.getInstalledLookAndFeels().length]; + for(int i = 0; i < lnfs.length; i++) + lnfs[i] = UIManager.getInstalledLookAndFeels()[i].getName(); + cmbLookAndFeel = new JComboBox(lnfs); + cmbLookAndFeel.setBounds(100, 15, 280, 20); + cmbLookAndFeel.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + try { + for(UIManager.LookAndFeelInfo lnf : + UIManager.getInstalledLookAndFeels()) + if(lnf.getName().equalsIgnoreCase( + cmbLookAndFeel.getSelectedItem().toString())) { + UIManager.setLookAndFeel(lnf.getClassName()); + SwingUtilities.updateComponentTreeUI( + owner.playDialog); + SwingUtilities.updateComponentTreeUI( + owner.equalizerDialog); + SwingUtilities.updateComponentTreeUI( + owner.playlistDialog); + SwingUtilities.updateComponentTreeUI( + owner.preferencesDialog); + break; + } + } + catch(Exception ex) { + } + } + }); + 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); + panAppearance.add(chbDocking); + lblDockingD = new JLabel(Language.get("DOCKINGD")); + lblDockingD.setBounds(10, 90, 140, 20); + panAppearance.add(lblDockingD); + tfdDockingD = new JTextField(); + tfdDockingD.setBounds(150, 90, 50, 20); + panAppearance.add(tfdDockingD); panPlugins = new JPanel(null); panPlugins.setBorder(BorderFactory.createTitledBorder( Language.get("PLUGINS"))); panPlugins.setBounds(170, 10, 395, 400); + panSoundOutput = new JPanel(null); + panSoundOutput.setBorder(BorderFactory.createTitledBorder( + Language.get("PLUGINS") + " - " + Language.get("SOUND_OUTPUT"))); + panSoundOutput.setBounds(170, 10, 395, 400); + panVisualization = new JPanel(null); panVisualization.setBorder(BorderFactory.createTitledBorder( - Language.get("PLUGINS") + " - " + - Language.get("VISUALIZATION"))); + Language.get("PLUGINS") + " - " + Language.get("VISUALIZATION"))); panVisualization.setBounds(170, 10, 395, 400); add(scpPreferences); @@ -270,8 +342,9 @@ add(panGenPref); add(panPlaylist); add(panTitles); - add(panApperance); + add(panAppearance); add(panPlugins); + add(panSoundOutput); add(panVisualization); add(btnClose); @@ -283,9 +356,36 @@ panGenPref.setVisible(false); panPlaylist.setVisible(false); panTitles.setVisible(false); - panApperance.setVisible(false); + panAppearance.setVisible(false); panPlugins.setVisible(false); + panSoundOutput.setVisible(false); panVisualization.setVisible(false); pan.setVisible(true); } + + public void closing() { + Settings.language = (String)cmbLanguage.getSelectedItem(); + Settings.proxyEnabled = chbProxy.isSelected(); + Settings.proxyHost = tfdProxyHost.getText(); + try { + Settings.proxyPort = Integer.parseInt(tfdProxyPort.getText()); + if(Settings.proxyPort < 0) + Settings.proxyPort = 0; + else if(Settings.proxyPort > 65535) + Settings.proxyPort = 65535; + } + catch(Exception e) { + Settings.proxyPort = -1; + } + Settings.splash = chbSplash.isSelected(); + Settings.multiple = chbMultiple.isSelected(); + Settings.update = chbUpdate.isSelected(); + Settings.showInTaskbar = chbTaskbar.isSelected(); + Settings.showInSysTray = chbSysTray.isSelected(); + Settings.scrollTitle = chbScroll.isSelected(); + //Settings.docking = ... + //Settings.dockingd = ... + //... + setVisible(false); + } } \ No newline at end of file Index: JavaAmp.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- JavaAmp.java 26 Mar 2006 15:13:13 -0000 1.17 +++ JavaAmp.java 5 Apr 2006 20:22:05 -0000 1.18 @@ -7,6 +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"; PlayDialog playDialog; PlaylistDialog playlistDialog; @@ -23,6 +25,18 @@ Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { try { + Settings.playDialogVisible = playDialog.isVisible(); + Settings.playDialogX = playDialog.getLocation().x; + Settings.playDialogY = playDialog.getLocation().y; + Settings.equalizerDialogVisible = + equalizerDialog.isVisible(); + Settings.equalizerDialogX = equalizerDialog.getLocation().x; + Settings.equalizerDialogY = equalizerDialog.getLocation().y; + Settings.playlistDialogVisible = playlistDialog.isVisible(); + Settings.playlistDialogX = playlistDialog.getLocation().x; + Settings.playlistDialogY = playlistDialog.getLocation().y; + Settings.playlistDialogWidth = playlistDialog.getWidth(); + Settings.playlistDialogHeight = playlistDialog.getHeight(); Settings.storeSettings(); } catch(Exception e) { @@ -64,6 +78,7 @@ equalizerDialog = new EqualizerDialog(this); playlistDialog = new PlaylistDialog(this); preferencesDialog = new PreferencesDialog(this); + playDialog.setLocation(Settings.playDialogX, Settings.playDialogY); equalizerDialog.setLocation(Settings.equalizerDialogX, Settings.equalizerDialogY); @@ -116,6 +131,38 @@ catch(Exception e) { } try { + Class cls = Class.forName( + "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); + LookAndFeel lnf = (LookAndFeel)cls.newInstance(); + UIManager.installLookAndFeel(lnf.getName(), cls.getName()); + } + catch(Exception e) { + } + try { + Class cls = Class.forName( + "com.jgoodies.looks.plastic.PlasticLookAndFeel"); + LookAndFeel lnf = (LookAndFeel)cls.newInstance(); + UIManager.installLookAndFeel(lnf.getName(), cls.getName()); + } + catch(Exception e) { + } + try { + Class cls = Class.forName( + "com.jgoodies.looks.plastic.PlasticXPLookAndFeel"); + LookAndFeel lnf = (LookAndFeel)cls.newInstance(); + UIManager.installLookAndFeel(lnf.getName(), cls.getName()); + } + catch(Exception e) { + } + try { + Class cls = Class.forName( + "com.jgoodies.looks.windows.WindowsLookAndFeel"); + LookAndFeel lnf = (LookAndFeel)cls.newInstance(); + UIManager.installLookAndFeel(lnf.getName(), cls.getName()); + } + catch(Exception e) { + } + try { UIManager.setLookAndFeel( "com.jgoodies.looks.plastic.Plastic3DLookAndFeel"); } Index: EQLabel.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/EQLabel.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- EQLabel.java 19 Mar 2006 11:34:07 -0000 1.10 +++ EQLabel.java 5 Apr 2006 20:22:05 -0000 1.11 @@ -36,6 +36,12 @@ // TODO: Equalizer anpassen } + private void setRGBs(int[] x, int[] y, int r, int g, int b) { + int[] col = new int[] { r, g, b }; + for(int i = 0; i < x.length; i++) + offscreen.getRaster().setPixel(x[i], y[i], col); + } + public void paint(Graphics g) { offg.setColor(Color.WHITE); offg.fillRect(0, 0, 239, 66); @@ -47,14 +53,14 @@ int _r2 = _r + (int)(Math.pow(j - 11, 2) * (255 - _r) / 121); int _g2 = _g + (int)(Math.pow(j - 11, 2) * (255 - _g) / 121); int _b2 = 255 - j * 255 / 11; - for(int k = 0; k <= 33; k++) { - offg.setColor(new Color(_r2 * (k + 33) / 66, _g2 * - (k + 33) / 66, _b2 * (k + 33) / 66)); - offg.fillRect(i * 24 + j + 1, 32 - k, 1, 1); - offg.fillRect(i * 24 + j + 1, 32 + k, 1, 1); - offg.fillRect(i * 24 - j + 21, 32 - k, 1, 1); - offg.fillRect(i * 24 - j + 21, 32 + k, 1, 1); - } + for(int k = 33; k < 66; k++) + setRGBs(new int[] { i * 24 + j + 1, i * 24 - j + 21, i * + 24 + j + 1, i * 24 - j + 21 }, new int[] { 65 - k, 65 - + k, -1 + k, -1 + k }, _r2 * k / 66, _g2 * k / 66, _b2 * + k / 66); + setRGBs(new int[] { i * 24 + j + 1, i * 24 - j + 21 }, + new int[] { 65, 65 }, _r2 * 65 / 66, _g2 * 65 / 66, _b2 * + 65 / 66); } offg.setColor(Color.LIGHT_GRAY); offg.drawLine(i * 24 - 1, 0, i * 24 - 1, 65); Index: PlayDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- PlayDialog.java 26 Mar 2006 11:18:05 -0000 1.15 +++ PlayDialog.java 5 Apr 2006 20:22:05 -0000 1.16 @@ -123,79 +123,7 @@ return; ow += e.getX() - mx; oh += e.getY() - my; - if(Settings.docking) { - Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); - if(!dockedPlaylist2 && owner.playlistDialog.isVisible()) - dockedPlaylist = Docker.dock(Settings.dockingd, p, new - Rectangle(ow, oh, getWidth(), getHeight()), - owner.playlistDialog.getBounds()); - if(!dockedEqualizer2 && owner.equalizerDialog.isVisible()) - dockedEqualizer = Docker.dock(Settings.dockingd, p, new - Rectangle(ow, oh, getWidth(), getHeight()), - owner.equalizerDialog.getBounds()); - ow = p.x; - oh = p.y; - } - if((dockedPlaylist2 || (dockedEqualizer2 && - owner.equalizerDialog.dockedPlaylist2)) && - owner.playlistDialog.isVisible()) { - Point p = new Point(ow + ow2, oh + oh2); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow2, - oh + oh2, owner.playlistDialog.getWidth(), - owner.playlistDialog.getHeight()), - getToolkit().getScreenInsets( - getGraphicsConfiguration())); - ow = p.x - ow2; - oh = p.y - oh2; - } - if((dockedEqualizer2 || (dockedPlaylist2 && - owner.equalizerDialog.dockedPlaylist2)) && - owner.equalizerDialog.isVisible()) { - Point p = new Point(ow + ow3, oh + oh3); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow3, - oh + oh3, owner.equalizerDialog.getWidth(), - owner.equalizerDialog.getHeight()), - getToolkit().getScreenInsets( - getGraphicsConfiguration())); - ow = p.x - ow3; - oh = p.y - oh3; - } - if(dockedPlaylist2 || (dockedEqualizer2 && - owner.equalizerDialog.dockedPlaylist2)) { - Point p = new Point(ow + ow2, oh + oh2); - if(!owner.equalizerDialog.dockedPlaylist2 && - owner.playlistDialog.isVisible() && - owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = - Docker.dock(Settings.dockingd, p, new Rectangle(ow + - ow2, oh + oh2, owner.playlistDialog.getWidth(), - owner.playlistDialog.getHeight()), - owner.equalizerDialog.getBounds()); - ow = p.x - ow2; - oh = p.y - oh2; - } - owner.playlistDialog.setLocation(ow + ow2, oh + oh2); - } - if(dockedEqualizer2 || (dockedPlaylist2 && - owner.equalizerDialog.dockedPlaylist2)) { - Point p = new Point(ow + ow3, oh + oh3); - if(!owner.equalizerDialog.dockedPlaylist2 && - owner.playlistDialog.isVisible() && - owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = - Docker.dock(Settings.dockingd, p, new Rectangle(ow + - ow3, oh + oh3, owner.equalizerDialog.getWidth(), - owner.equalizerDialog.getHeight()), - owner.playlistDialog.getBounds()); - ow = p.x - ow3; - oh = p.y - oh3; - } - owner.equalizerDialog.setLocation(ow + ow3, oh + oh3); - } - setLocation(ow, oh); + dock(true); } }); @@ -609,12 +537,102 @@ splSpectrum.start(); } + public void dock(boolean moved) { + if(!moved) { + ow = getLocation().x; + oh = getLocation().y; + ow2 = owner.playlistDialog.getLocation().x - ow; + oh2 = owner.playlistDialog.getLocation().y - oh; + ow3 = owner.equalizerDialog.getLocation().x - ow; + oh3 = owner.equalizerDialog.getLocation().y - oh; + } + if(Settings.docking) { + Point p = new Point(ow, oh); + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, + getWidth(), getHeight()), getToolkit().getScreenInsets( + getGraphicsConfiguration())); + if(!dockedPlaylist2 && owner.playlistDialog.isVisible()) + dockedPlaylist = Docker.dock(Settings.dockingd, p, new + Rectangle(ow, oh, getWidth(), getHeight()), + owner.playlistDialog.getBounds()); + if(!dockedEqualizer2 && owner.equalizerDialog.isVisible()) + dockedEqualizer = Docker.dock(Settings.dockingd, p, new + Rectangle(ow, oh, getWidth(), getHeight()), + owner.equalizerDialog.getBounds()); + ow = p.x; + oh = p.y; + if((dockedPlaylist2 || (dockedEqualizer2 && + owner.equalizerDialog.dockedPlaylist2)) && + owner.playlistDialog.isVisible()) { + p = new Point(ow + ow2, oh + oh2); + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow2, + oh + oh2, owner.playlistDialog.getWidth(), + owner.playlistDialog.getHeight()), + getToolkit().getScreenInsets( + getGraphicsConfiguration())); + ow = p.x - ow2; + oh = p.y - oh2; + } + if((dockedEqualizer2 || (dockedPlaylist2 && + owner.equalizerDialog.dockedPlaylist2)) && + owner.equalizerDialog.isVisible()) { + p = new Point(ow + ow3, oh + oh3); + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow3, + oh + oh3, owner.equalizerDialog.getWidth(), + owner.equalizerDialog.getHeight()), + getToolkit().getScreenInsets( + getGraphicsConfiguration())); + ow = p.x - ow3; + oh = p.y - oh3; + } + if(dockedPlaylist2 || (dockedEqualizer2 && + owner.equalizerDialog.dockedPlaylist2)) { + p = new Point(ow + ow2, oh + oh2); + if(!owner.equalizerDialog.dockedPlaylist2 && + owner.playlistDialog.isVisible() && + owner.equalizerDialog.isVisible()) { + owner.equalizerDialog.dockedPlaylist = + Docker.dock(Settings.dockingd, p, new Rectangle(ow + + ow2, oh + oh2, owner.playlistDialog.getWidth(), + owner.playlistDialog.getHeight()), + owner.equalizerDialog.getBounds()); + ow = p.x - ow2; + oh = p.y - oh2; + } + owner.playlistDialog.setLocation(ow + ow2, oh + oh2); + } + if(dockedEqualizer2 || (dockedPlaylist2 && + owner.equalizerDialog.dockedPlaylist2)) { + p = new Point(ow + ow3, oh + oh3); + if(!owner.equalizerDialog.dockedPlaylist2 && + owner.playlistDialog.isVisible() && + owner.equalizerDialog.isVisible()) { + owner.equalizerDialog.dockedPlaylist = + Docker.dock(Settings.dockingd, p, new Rectangle(ow + + ow3, oh + oh3, owner.equalizerDialog.getWidth(), + owner.equalizerDialog.getHeight()), + owner.playlistDialog.getBounds()); + ow = p.x - ow3; + oh = p.y - oh3; + } + owner.equalizerDialog.setLocation(ow + ow3, oh + oh3); + } + } + setLocation(ow, oh); + } + + public void setVisible(boolean b) { + super.setVisible(b); + dock(false); + } + public void showAbout() { owner.oppMessages.showMessageDialog(null, "<html><font size=3><b>Java" + - "Amp</b></font><br>Copyright © 2006 Andreas Wiesbauer<br>v0." + - "0.4 - Mar 17 2006<br>Visit http://javaamp.sourceforge.net for up" + - "dates.<br>Relesed under the conditions of the BSD-license.</html" + - ">", "About JavaAmp", JOptionPane.INFORMATION_MESSAGE, + "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", + JOptionPane.INFORMATION_MESSAGE, new ImageIcon(GraphicsLoader.jaa1)); } Index: Settings.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Settings.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Settings.java 26 Mar 2006 11:18:05 -0000 1.4 +++ Settings.java 5 Apr 2006 20:22:05 -0000 1.5 @@ -30,6 +30,7 @@ }; static String language; + static boolean proxyEnabled; static String proxyHost; static int proxyPort; static boolean splash; @@ -71,6 +72,7 @@ catch(Exception e) { } language = getStringValue(p.get("Language"), "English"); + proxyEnabled = getBooleanValue(p.get("ProxyEnable"), false); proxyHost = getStringValue(p.get("ProxyHost"), ""); proxyPort = getIntValue(p.get("ProxyPort"), -1); if(proxyPort < 0 || proxyPort > 65535) @@ -97,7 +99,7 @@ maxchannels = 1; else if(maxchannels > 1024) maxchannels = 1024; - buffersize = getIntValue(p.get("BufferSize"), 400); + buffersize = getIntValue(p.get("BufferSize"), 100); if(buffersize < 50) buffersize = 50; else if(buffersize > 5000) @@ -189,6 +191,7 @@ public final static void storeSettings() throws Exception { Properties p = new Properties(); p.put("Language", language); + p.put("ProxyEnable", Boolean.toString(proxyEnabled)); p.put("ProxyHost", proxyHost); p.put("ProxyPort", "" + proxyPort); p.put("Splash", Boolean.toString(splash)); Index: PlaylistDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlaylistDialog.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- PlaylistDialog.java 26 Mar 2006 11:18:05 -0000 1.25 +++ PlaylistDialog.java 5 Apr 2006 20:22:05 -0000 1.26 @@ -66,7 +66,6 @@ owner = o; setUndecorated(true); - setSize(275, 115); addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { @@ -121,47 +120,12 @@ int height = oh - my + e.getY(); if(height < 115) height = 115; - setSize(width, height); - - scpPlaylist.setBounds(5, 5, width - 10, height - 32); - btnAdd.setLocation(5, height - 25); - btnRem.setLocation(67, height - 25); - btnSel.setLocation(129, height - 25); - btnMsc.setLocation(191, height - 25); - lblResize.setLocation(width - 15, height - 15); - - validate(); } else if(ct == 2) { ow += e.getX() - mx; oh += e.getY() - my; - if(Settings.docking) { - Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, - oh, getWidth(), getHeight()), - getToolkit().getScreenInsets( - getGraphicsConfiguration())); - owner.playDialog.dockedPlaylist = Docker.dock( - 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( - Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), - owner.equalizerDialog.getBounds()); - ow = p.x; - oh = p.y; - } - else - owner.equalizerDialog.dockedPlaylist = - Docker.isDocked(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.equalizerDialog.getBounds()); - } - setLocation(ow, oh); + dock(true); } } }); @@ -535,6 +499,72 @@ setContentPane(cntContainer); } + public void relocateComponents() { + scpPlaylist.setBounds(5, 5, getWidth() - 10, getHeight() - 32); + btnAdd.setLocation(5, getHeight() - 25); + btnRem.setLocation(67, getHeight() - 25); + btnSel.setLocation(129, getHeight() - 25); + btnMsc.setLocation(191, getHeight() - 25); + lblResize.setLocation(getWidth() - 15, getHeight() - 15); + + validate(); + } + + public void setBounds(int x, int y, int width, int height) { + super.setBounds(x, y, width, height); + relocateComponents(); + } + + public void setBounds(Rectangle r) { + super.setBounds(r); + relocateComponents(); + } + + public void setSize(int width, int height) { + super.setSize(width, height); + relocateComponents(); + } + + public void setSize(Dimension d) { + super.setSize(d); + relocateComponents(); + } + + public void dock(boolean moved) { + if(!moved) { + ow = getLocation().x; + oh = getLocation().y; + } + if(Settings.docking) { + Point p = new Point(ow, oh); + Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, + getWidth(), getHeight()), getToolkit().getScreenInsets( + getGraphicsConfiguration())); + owner.playDialog.dockedPlaylist = Docker.dock(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( + Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.equalizerDialog.getBounds()); + ow = p.x; + oh = p.y; + } + else + owner.equalizerDialog.dockedPlaylist = Docker.isDocked( + Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.equalizerDialog.getBounds()); + } + setLocation(ow, oh); + } + + public void setVisible(boolean b) { + super.setVisible(b); + dock(false); + } + public void addURL() { String str = owner.oppMessages.showInputDialog(this, Language.get( "ENTER_URL"), Language.get("ADD_URL"), JOptionPane.PLAIN_MESSAGE); |
|
From: WiESi <wi...@us...> - 2006-04-05 20:21:06
|
Update of /cvsroot/javaamp/javaamp/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2940/res Modified Files: javaamp32.png opengl.png Log Message: Index: javaamp32.png =================================================================== RCS file: /cvsroot/javaamp/javaamp/res/javaamp32.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsdmWQbZ and /tmp/cvs8rcLCr differ Index: opengl.png =================================================================== RCS file: /cvsroot/javaamp/javaamp/res/opengl.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsiKxg7F and /tmp/cvsc0wOoa differ |
|
From: WiESi <wi...@us...> - 2006-04-05 20:20:03
|
Update of /cvsroot/javaamp/javaamp/language In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1963/language Modified Files: english.ini german.ini languages.ini Log Message: Index: languages.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/languages.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- languages.ini 19 Mar 2006 10:19:51 -0000 1.1 +++ languages.ini 5 Apr 2006 20:19:50 -0000 1.2 @@ -1,2 +1,2 @@ -English=english.ini +#English=english.ini German=german.ini Index: german.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/german.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- german.ini 19 Mar 2006 10:19:51 -0000 1.1 +++ german.ini 5 Apr 2006 20:19:50 -0000 1.2 @@ -21,6 +21,8 @@ CENTER=Mitte DELETE=Löschen DIRECTORY=Verzeichnis +DOCKING=Fensterandocken aktivieren +DOCKINGD=Docken bei (Pixel): ENABLE_PROXY=Proxy aktivieren ENTER_URL=URL eingeben: EQF_FILES=EQF Dateien @@ -51,6 +53,7 @@ LOAD_INFORMATIONS_UNEXACTLY=Lade Informationen (ungenau) LOAD_PLAYLIST=Lade Playlist LOADING_INFORMATIONS=Lade Dateiinformationen... +LOOK_AND_FEEL=Look and Feel: MISCELLANEOUS=Sonstiges MISCELLANEOUS_SHORT=Son M3U_FILES=M3U Dateien @@ -100,10 +103,12 @@ SHOW_PLAYLIST=Playlist anzeigen SHOW_SPLASH=Splash Screen zeigen SHUFFLE=Shuffle +SOUND_OUTPUT=Soundausgabe START_VISUALIZATION=Visualisierung starten STOP=Stop SYSTRAY=System Tray TASKBAR=Taskbar +THEME=Thema: TITLES=Titel TRACK_ID=Track ID UNDEFINED=Undefiniert Index: english.ini =================================================================== RCS file: /cvsroot/javaamp/javaamp/language/english.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- english.ini 19 Mar 2006 10:19:51 -0000 1.1 +++ english.ini 5 Apr 2006 20:19:50 -0000 1.2 @@ -21,6 +21,8 @@ CENTER=Center DELETE=Delete DIRECTORY=Directory +DOCKING=Enable window docking +DOCKINGD=Docking distance (pixels): ENABLE_PROXY=Enable proxy ENTER_URL=Enter URL: EQF_FILES=EQF files @@ -51,6 +53,7 @@ LOAD_INFORMATIONS_UNEXACTLY=Load informations (unexactly) LOAD_PLAYLIST=Load playlist LOADING_INFORMATIONS=Loading file informations... +LOOK_AND_FEEL=Look and Feel: MISCELLANEOUS=Miscellaneous MISCELLANEOUS_SHORT=Msc M3U_FILES=M3U files @@ -100,10 +103,12 @@ SHOW_PLAYLIST=Show playlist SHOW_SPLASH=Show splash screen SHUFFLE=Shuffle +SOUND_OUTPUT=Sound output START_VISUALIZATION=Start visualization STOP=Stop SYSTRAY=System tray TASKBAR=Taskbar +THEME=Theme: TITLES=Titles TRACK_ID=Track ID UNDEFINED=Undefined |
|
From: WiESi <wi...@us...> - 2006-03-26 16:20:59
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22659/src Modified Files: Language.java Log Message: Bug fix in language Index: Language.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Language.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Language.java 25 Mar 2006 06:51:45 -0000 1.2 +++ Language.java 26 Mar 2006 16:20:54 -0000 1.3 @@ -125,12 +125,16 @@ public final static void loadLanguage(Class cls, String language) throws Exception { Properties p = new Properties(); - p.load(new FileInputStream(new File(System.getProperty("user.dir"), - "/language/languages.ini"))); + try { + p.load(new FileInputStream(new File(System.getProperty("user.dir"), + "/language/languages.ini"))); + } + catch(Exception e) { + } int j = 0, k = -1; if(language.equals("English")) j++; - for(int i = 0; i < p.keySet().toArray().length; i++) { + for(int i = 0; i < p.keySet().toArray().length; i++) if(p.keySet().toArray()[i].toString().equals(language)) { j++; k = i; @@ -138,7 +142,6 @@ throw new Exception( "Language definition twice ore more not allowed"); } - } if(j < 1) throw new Exception("Language not defined"); if(language.equals("English")) { |
