Menu
▾
▴
[JavaAmp-CVS] javaamp/src EqualizerDialog.java,1.19,1.20 JavaAmp.java,1.23,1.24 PlayDialog.java,1.18,1.19 PlaylistDialog.java,1.26,1.27
|
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); } |
