X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=95c08a148a6f746c599a3dad56a20f1b7764a753;hb=24ad8bbb87343e317452c0dcb22efd800e7986d6;hp=eaa2c5e6ec4e52f02833c5c5b00115110d7ba420;hpb=3f578998521236c208e9d3c7790d4d5ac4da0a50;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index eaa2c5e..95c08a1 100755 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -12,13 +12,16 @@ package jalview.gui; import jalview.gui.*; import jalview.io.*; import jalview.datamodel.*; -import jalview.schemes.*; import javax.swing.*; import java.awt.*; import java.awt.event.*; +import java.awt.dnd.*; +import javax.swing.*; +import java.awt.datatransfer.*; +import jalview.bin.Cache; -public class Desktop extends jalview.jbgui.GDesktop +public class Desktop extends jalview.jbgui.GDesktop implements DropTargetListener { public static JDesktopPane desktop; static int openFrameCount = 0; @@ -28,7 +31,7 @@ public class Desktop extends jalview.jbgui.GDesktop { Image image =null; try{ - java.net.URL url = getClass().getResource("/images/BartonGroupBanner.gif"); + java.net.URL url = getClass().getResource("/images/logo.gif"); if(url!=null) { image = java.awt.Toolkit.getDefaultToolkit().createImage(url); @@ -42,12 +45,17 @@ public class Desktop extends jalview.jbgui.GDesktop setTitle("Jalview 2005"); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - setVisible(true); 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"); @@ -77,48 +85,42 @@ public void windowClosing(WindowEvent evt) jalview.bin.Cache.setProperty("SCREEN_HEIGHT", getHeight() + ""); } }); +setVisible(true); -/////////Add a splashscreen on startup - +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); - frame.setVisible(true); - 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); - } - 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); - frame.setVisible(true); 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(); final JMenuItem menuItem = new JMenuItem(title); @@ -139,14 +141,40 @@ public void windowClosing(WindowEvent evt) } }); + frame.setVisible(true); windowMenu.add(menuItem); } + public void dragEnter(DropTargetDragEvent evt){} + public void dragExit(DropTargetEvent evt){} + public void dragOver(DropTargetDragEvent evt){} + public void dropActionChanged(DropTargetDragEvent evt){} + public void drop(DropTargetDropEvent evt) +{ + Transferable t = evt.getTransferable(); + if(!t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) + return; + + evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); + try{ + java.util.List files = (java.util.List) t.getTransferData(DataFlavor.javaFileListFlavor); + + for (int i = 0; i < files.size(); i++) + { + String file = files.get(i).toString(); + String protocol = "File"; + String format = jalview.io.IdentifyFile.Identify(file, protocol); + LoadFile(file, protocol, format); + } + + }catch(Exception ex){ex.printStackTrace();} + } public void inputLocalFileMenuItem_actionPerformed(ActionEvent e) { - JalviewFileChooser chooser = new JalviewFileChooser(); + JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"), + new String[]{"fa", "fasta", "fastq", "blc", "msf", "pfam", "aln", "pir"}, "Alignment files"); chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Open local file"); chooser.setToolTipText("Open"); @@ -162,39 +190,62 @@ public void windowClosing(WindowEvent evt) 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) + 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" - ,"Error loading file", - JOptionPane.WARNING_MESSAGE); + public void run() + { + SequenceI [] sequences = null; + + if (FormatAdapter.formats.contains(format)) + sequences = FormatAdapter.readFile(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); + try{ + af.setMaximum(Preferences.showFullscreen); + }catch(Exception ex){} + + } + 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) { + JOptionPane op = new JOptionPane(); + String url = JOptionPane.showInternalInputDialog(Desktop.desktop,"Enter url of input file", "Input alignment from URL", - JOptionPane.QUESTION_MESSAGE); + JOptionPane.QUESTION_MESSAGE, + null, null, + "http://www.").toString(); if (url == null) return; String format = IdentifyFile.Identify(url, "URL"); - System.out.println(format +" format"); if (format.equals("URL NOT FOUND")) { JOptionPane.showInternalMessageDialog(Desktop.desktop,"Couldn't locate " + url, @@ -221,14 +272,16 @@ public void windowClosing(WindowEvent evt) String format = IdentifyFile.Identify(cap.getText(), "Paste"); SequenceI [] sequences = null; - if (FormatProperties.contains( format )) - sequences = FormatAdapter.read(cap.getText(), "Paste", format); + if (FormatAdapter.formats.contains( format )) + sequences = FormatAdapter.readFile(cap.getText(), "Paste", format); 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 @@ -256,10 +309,12 @@ public void windowClosing(WindowEvent evt) public void aboutMenuItem_actionPerformed(ActionEvent e) { JOptionPane.showInternalMessageDialog(Desktop.desktop, - "JalView 2005" + "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: \"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); } @@ -284,86 +339,11 @@ public void windowClosing(WindowEvent evt) } } - static JInternalFrame conservationSlider; - static JInternalFrame PIDSlider; - public static int setConservationSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source) + protected void preferences_actionPerformed(ActionEvent e) { - SliderPanel sp = null; - - if(conservationSlider == null) - { - sp = new SliderPanel(ap, 30, true, cs); - conservationSlider = new JInternalFrame(); - conservationSlider.setContentPane(sp); - conservationSlider.setResizable(false); - addInternalFrame(conservationSlider, "Conservation Colour Increment ("+source+")", 420, 90); - 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; - } - - if(ap.av.alignment.getGroups()!=null) - sp.setAllGroupsCheckEnabled( true ); - else - sp.setAllGroupsCheckEnabled( false); - - return sp.getValue(); - + Preferences pref = new Preferences(); } - 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); - PIDSlider.setResizable(false); - addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90); - } - 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(); - - } - -}