X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=1226f6794c645999f65931b873dfa926d7c29882;hb=e7ed63f1ea56432246a6ed1553f0fe56d26f56ea;hp=6dca15bf5d6da8edb758d56c6cdd3d77e2fb8da6;hpb=7fa59a130a2587d07fee111ebe9278fb6878e751;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 6dca15b..1226f67 100755 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -47,10 +47,16 @@ public class Desktop extends jalview.jbgui.GDesktop implements DropTargetListene setTitle("Jalview 2005"); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); desktop = new JDesktopPane(); - // desktop.setBackground(Color.white); + // desktop.setBackground(Color.white); setContentPane(desktop); desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE); + + // This line prevents Windows Look&Feel resizing all new windows to maximum + // if previous window was maximised + desktop.setDesktopManager( new DefaultDesktopManager() ); + + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); String x = jalview.bin.Cache.getProperty("SCREEN_X"); String y = jalview.bin.Cache.getProperty("SCREEN_Y"); @@ -84,45 +90,37 @@ setVisible(true); this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); - +/////////Add a splashscreen on startup /////////Add a splashscreen on startup JInternalFrame frame = new JInternalFrame(); SplashScreen splash = new SplashScreen(frame, image); frame.setContentPane(splash); - desktop.add(frame); - - openFrameCount++; - try - { - frame.setSelected(true); - } - catch (java.beans.PropertyVetoException e) - {} - frame.setResizable(true); - frame.setSize(750, 160); + frame.setLayer(JLayeredPane.PALETTE_LAYER); + addInternalFrame(frame, "", 750,160, false); frame.setLocation( (int)((getWidth()-750) /2), (int)((getHeight()-160) /2)); - frame.setClosable(false); - frame.setIconifiable(false); - frame.setMaximizable(false); - frame.setFrameIcon(null); - frame.setVisible(true); - } - public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h) { + addInternalFrame(frame, title, w, h, true); + } + + public static void addInternalFrame(final JInternalFrame frame, String title, + int w, + int h, + boolean resizable ) + { desktop.add(frame); openFrameCount++; try { frame.setSelected(true); } catch (java.beans.PropertyVetoException e) {} frame.setTitle(title); - frame.setResizable(true); frame.setSize(w,h); frame.setClosable(true); - frame.setMaximizable(true); - frame.setIconifiable(true); + frame.setResizable(resizable); + frame.setMaximizable(resizable); + frame.setIconifiable(resizable); frame.setFrameIcon(null); frame.setLocation(xOffset*openFrameCount, yOffset*openFrameCount); frame.toFront(); @@ -192,27 +190,44 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); public void LoadFile(String file, String protocol, String format) { - SequenceI [] sequences = null; + LoadingThread loader = new LoadingThread(file, protocol, format); + loader.start(); + } - if (FormatProperties.contains(format)) - sequences = FormatAdapter.read(file, protocol, format); + class LoadingThread extends Thread + { + String file, protocol, format; - if (sequences != null && sequences.length>0) + public LoadingThread(String file, String protocol, String format) { - AlignFrame af = new AlignFrame(new Alignment(sequences)); - addInternalFrame(af, file, 700, 500); - af.statusBar.setText("Successfully loaded file " + file); - + this.file = file; + this.protocol = protocol; + this.format = format; } - else - JOptionPane.showInternalMessageDialog(Desktop.desktop, "Couldn't open file.\n" - + "Formats currently supported are\n" - + "Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM" // JBPNote - message should be generated through FormatAdapter! - ,"Error loading file", - JOptionPane.WARNING_MESSAGE); + public void run() + { + SequenceI [] sequences = null; + + if (FormatProperties.contains(format)) + sequences = FormatAdapter.read(file, protocol, format); + + if (sequences != null && sequences.length>0) + { + AlignFrame af = new AlignFrame(new Alignment(sequences)); + addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT); + af.statusBar.setText("Successfully loaded file " + file); + } + else + JOptionPane.showInternalMessageDialog(Desktop.desktop, "Couldn't open file.\n" + + "Formats currently supported are\n" + + "Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM" // JBPNote - message should be generated through FormatAdapter! + ,"Error loading file", + JOptionPane.WARNING_MESSAGE); + } } + public void inputURLMenuItem_actionPerformed(ActionEvent e) { String url = JOptionPane.showInternalInputDialog(Desktop.desktop,"Enter url of input file", @@ -256,7 +271,9 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); if(sequences!=null) { AlignFrame af = new AlignFrame(new Alignment(sequences)); - addInternalFrame(af, "Cut & Paste input - "+format, 700, 500); + addInternalFrame(af, "Cut & Paste input - "+format, + AlignFrame.NEW_WINDOW_WIDTH, + AlignFrame.NEW_WINDOW_HEIGHT); af.statusBar.setText("Successfully pasted alignment file"); } else @@ -287,8 +304,9 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); "JalView 2005 version " + jalview.bin.Cache.VERSION+"; last updated: "+jalview.bin.Cache.BUILD_DATE +"\nAuthors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton." +"\nCurrent development managed by Andrew Waterhouse; Barton Group, University of Dundee." - +"\nIf you use JalView, please cite: Bioinformatics, 2004 12;426-7." - +"\n\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"", + +"\nIf you use JalView, please cite:" + +"\n\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"" + +"\nBioinformatics, 2004 12;426-7.", "About Jalview", JOptionPane.INFORMATION_MESSAGE); } @@ -312,93 +330,6 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); ex.printStackTrace(); } } - - static JInternalFrame conservationSlider; - static JInternalFrame PIDSlider; - public static int setConservationSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source) - { - SliderPanel sp = null; - ConservationColourScheme ccs = (ConservationColourScheme)cs; - int value = ccs.inc; - - if(conservationSlider == null) - { - sp = new SliderPanel(ap, value, true, cs); - conservationSlider = new JInternalFrame(); - conservationSlider.setContentPane(sp); - addInternalFrame(conservationSlider, "Conservation Colour Increment ("+source+")", 420, 90); - conservationSlider.setResizable(false); - conservationSlider.setMaximizable(false); - conservationSlider.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() - { - public void internalFrameClosed(javax.swing.event.InternalFrameEvent e) - { - conservationSlider = null; - } - }); - } - else - { - - conservationSlider.setTitle("Conservation Colour Increment ("+source+")"); - sp = (SliderPanel)conservationSlider.getContentPane(); - sp.cs = cs; - sp.setValue(value); - } - - if(ap.av.alignment.getGroups()!=null) - sp.setAllGroupsCheckEnabled( true ); - else - sp.setAllGroupsCheckEnabled( false); - - return sp.getValue(); - - } - - public static void hideConservationSlider() - { - try{ - conservationSlider.setClosed(true); - conservationSlider = null; - }catch(Exception ex){} } - public static void hidePIDSlider() - { - try{ - PIDSlider.setClosed(true); - PIDSlider = null; - }catch(Exception ex){} - } - - public static int setPIDSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source) - { - SliderPanel pid = null; - if(PIDSlider == null) - { - pid = new SliderPanel(ap, 50, false, cs); - PIDSlider = new JInternalFrame(); - PIDSlider.setContentPane(pid); - addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90); - PIDSlider.setResizable(false); - PIDSlider.setMaximizable(false); - } - else - { - PIDSlider.setTitle("Percentage Identity Threshold ("+source+")"); - pid = (SliderPanel)PIDSlider.getContentPane(); - pid.cs = cs; - } - - if (ap.av.alignment.getGroups() != null) - pid.setAllGroupsCheckEnabled(true); - else - pid.setAllGroupsCheckEnabled(false); - - - return pid.getValue(); - - } - -}