git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use NEW_WINDOW_WIDTH
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
6baa2bb
..
331f882
100755
(executable)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-47,11
+47,16
@@
public class Desktop extends jalview.jbgui.GDesktop implements DropTargetListene
setTitle("Jalview 2005");
\r
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
\r
desktop = new JDesktopPane();
\r
setTitle("Jalview 2005");
\r
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
\r
desktop = new JDesktopPane();
\r
- desktop.setBackground(new Color(220,220,230));
\r
+ // desktop.setBackground(Color.white);
\r
setContentPane(desktop);
\r
desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
\r
setContentPane(desktop);
\r
desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
\r
+
\r
+
\r
+ // This line prevents Windows Look&Feel resizing all new windows to maximum
\r
+ // if previous window was maximised
\r
desktop.setDesktopManager( new DefaultDesktopManager() );
\r
\r
desktop.setDesktopManager( new DefaultDesktopManager() );
\r
\r
+
\r
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
\r
String x = jalview.bin.Cache.getProperty("SCREEN_X");
\r
String y = jalview.bin.Cache.getProperty("SCREEN_Y");
\r
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
\r
String x = jalview.bin.Cache.getProperty("SCREEN_X");
\r
String y = jalview.bin.Cache.getProperty("SCREEN_Y");
\r
@@
-110,20
+115,27
@@
this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
frame.setVisible(true);
\r
\r
}
\r
frame.setVisible(true);
\r
\r
}
\r
-
\r
public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h)
\r
{
\r
public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h)
\r
{
\r
+ addInternalFrame(frame, title, w, h, true);
\r
+ }
\r
+
\r
+ public static void addInternalFrame(final JInternalFrame frame, String title,
\r
+ int w,
\r
+ int h,
\r
+ boolean resizable )
\r
+ {
\r
desktop.add(frame);
\r
openFrameCount++;
\r
try {
\r
frame.setSelected(true);
\r
} catch (java.beans.PropertyVetoException e) {}
\r
frame.setTitle(title);
\r
desktop.add(frame);
\r
openFrameCount++;
\r
try {
\r
frame.setSelected(true);
\r
} catch (java.beans.PropertyVetoException e) {}
\r
frame.setTitle(title);
\r
- frame.setResizable(true);
\r
frame.setSize(w,h);
\r
frame.setClosable(true);
\r
frame.setSize(w,h);
\r
frame.setClosable(true);
\r
- frame.setMaximizable(true);
\r
- frame.setIconifiable(true);
\r
+ frame.setResizable(resizable);
\r
+ frame.setMaximizable(resizable);
\r
+ frame.setIconifiable(resizable);
\r
frame.setFrameIcon(null);
\r
frame.setLocation(xOffset*openFrameCount, yOffset*openFrameCount);
\r
frame.toFront();
\r
frame.setFrameIcon(null);
\r
frame.setLocation(xOffset*openFrameCount, yOffset*openFrameCount);
\r
frame.toFront();
\r
@@
-201,7
+213,7
@@
this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
if (sequences != null && sequences.length>0)
\r
{
\r
AlignFrame af = new AlignFrame(new Alignment(sequences));
\r
if (sequences != null && sequences.length>0)
\r
{
\r
AlignFrame af = new AlignFrame(new Alignment(sequences));
\r
- addInternalFrame(af, file, 700, 500);
\r
+ addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);
\r
af.statusBar.setText("Successfully loaded file " + file);
\r
\r
}
\r
af.statusBar.setText("Successfully loaded file " + file);
\r
\r
}
\r
@@
-257,7
+269,9
@@
this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
if(sequences!=null)
\r
{
\r
AlignFrame af = new AlignFrame(new Alignment(sequences));
\r
if(sequences!=null)
\r
{
\r
AlignFrame af = new AlignFrame(new Alignment(sequences));
\r
- addInternalFrame(af, "Cut & Paste input - "+format, 700, 500);
\r
+ addInternalFrame(af, "Cut & Paste input - "+format,
\r
+ AlignFrame.NEW_WINDOW_WIDTH,
\r
+ AlignFrame.NEW_WINDOW_HEIGHT);
\r
af.statusBar.setText("Successfully pasted alignment file");
\r
}
\r
else
\r
af.statusBar.setText("Successfully pasted alignment file");
\r
}
\r
else
\r
@@
-327,9
+341,7
@@
this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
sp = new SliderPanel(ap, value, true, cs);
\r
conservationSlider = new JInternalFrame();
\r
conservationSlider.setContentPane(sp);
\r
sp = new SliderPanel(ap, value, true, cs);
\r
conservationSlider = new JInternalFrame();
\r
conservationSlider.setContentPane(sp);
\r
- addInternalFrame(conservationSlider, "Conservation Colour Increment ("+source+")", 420, 90);
\r
- conservationSlider.setResizable(false);
\r
- conservationSlider.setMaximizable(false);
\r
+ addInternalFrame(conservationSlider, "Conservation Colour Increment ("+source+")", 420, 90, false);
\r
conservationSlider.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
\r
{
\r
public void internalFrameClosed(javax.swing.event.InternalFrameEvent e)
\r
conservationSlider.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
\r
{
\r
public void internalFrameClosed(javax.swing.event.InternalFrameEvent e)
\r
@@
-337,6
+349,7
@@
this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
conservationSlider = null;
\r
}
\r
});
\r
conservationSlider = null;
\r
}
\r
});
\r
+ conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
\r
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
@@
-381,9
+394,8
@@
this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
pid = new SliderPanel(ap, 50, false, cs);
\r
PIDSlider = new JInternalFrame();
\r
PIDSlider.setContentPane(pid);
\r
pid = new SliderPanel(ap, 50, false, cs);
\r
PIDSlider = new JInternalFrame();
\r
PIDSlider.setContentPane(pid);
\r
- addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90);
\r
- PIDSlider.setResizable(false);
\r
- PIDSlider.setMaximizable(false);
\r
+ addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90, false);
\r
+ PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
\r
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r