X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=e1356b4fe1b608dfd4e0144d724582922ce6880f;hb=d99d6a98cd0a7009e94ca4166f48741af75cde1e;hp=c58de43939781d16802bdd23989fc8d74f7c18c3;hpb=5e1ec7b34e30fb44c1dfd70b487997b278c5ef1f;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java old mode 100755 new mode 100644 index c58de43..e1356b4 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -48,15 +48,20 @@ import javax.swing.event.MenuListener; * * * @author $author$ - * @version $Revision$ + * @version $Revision: 1.155 $ */ public class Desktop extends jalview.jbgui.GDesktop implements - DropTargetListener, ClipboardOwner, IProgressIndicator + DropTargetListener, ClipboardOwner, IProgressIndicator, jalview.api.StructureSelectionManagerProvider { private JalviewChangeSupport changeSupport = new JalviewChangeSupport(); /** + * news reader - null if it was never started. + */ + private BlogReader jvnews=null; + + /** * @param listener * @see jalview.gui.JalviewChangeSupport#addJalviewPropertyChangeListener(java.beans.PropertyChangeListener) */ @@ -232,9 +237,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements showMemusage.setSelected(selmemusage); desktop.setBackground(Color.white); getContentPane().setLayout(new BorderLayout()); + // alternate config - have scrollbars - see notes in JAL-153 + //JScrollPane sp = new JScrollPane(); + //sp.getViewport().setView(desktop); + //getContentPane().add(sp, BorderLayout.CENTER); getContentPane().add(desktop, BorderLayout.CENTER); - desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE); - + 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 MyDesktopManager( @@ -263,6 +272,18 @@ public class Desktop extends jalview.jbgui.GDesktop implements showConsole(showjconsole); + showNews.setVisible(false); + final Desktop me = this; + // Thread off the news reader, in case there are connection problems. + new Thread( new Runnable() { + @Override + public void run() + { + jvnews = new BlogReader(me); + showNews.setVisible(true); + } + }).start(); + this.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent evt) @@ -324,6 +345,23 @@ public class Desktop extends jalview.jbgui.GDesktop implements }); } + protected void showNews_actionPerformed(ActionEvent e) + { + showNews(showNews.isSelected()); + } + void showNews(boolean visible) + { + { + jvnews.setVisible(visible); + showNews.setSelected(visible); + if (visible) + { + jvnews.refreshNews(); + jvnews.toFront(); + } + } + } + /** * recover the last known dimensions for a jalview window * @@ -631,6 +669,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements } catch (java.beans.PropertyVetoException ve) { } + catch (java.lang.ClassCastException cex) + { + Cache.log.warn("Squashed a possible GUI implementation error. If you can recreate this, please look at http://issues.jalview.org/browse/JAL-869",cex); + } } public void lostOwnership(Clipboard clipboard, Transferable contents) @@ -906,6 +948,12 @@ public class Desktop extends jalview.jbgui.GDesktop implements storeLastKnownDimensions("JAVA_CONSOLE_", jconsole.getBounds()); jconsole.stopConsole(); } + if (jvnews!=null) + { + storeLastKnownDimensions("JALVIEW_RSS_WINDOW_", jvnews.getBounds()); + + } + System.exit(0); } @@ -938,7 +986,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { message.append("\n\n!! Jalview version " + jalview.bin.Cache.getProperty("LATEST_VERSION") - + " is available for download from http://www.jalview.org !!\n"); + + " is available for download from "+jalview.bin.Cache.getDefault("www.jalview.org","http://www.jalview.org")+" !!\n"); } // TODO: update this text for each release or centrally store it for lite @@ -1174,11 +1222,18 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (value == JalviewFileChooser.APPROVE_OPTION) { - java.io.File choice = chooser.getSelectedFile(); + final Desktop me = this; + final java.io.File choice = chooser.getSelectedFile(); + new Thread(new Runnable() + { + public void run() + { + setProgressBar("Saving jalview project " + choice.getName(), choice.hashCode()); jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent()); // TODO catch and handle errors for savestate + // TODO prevent user from messing with the Desktop whilst we're saving try { new Jalview2XML().SaveState(choice); @@ -1191,12 +1246,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements Cache.log .error("Problems whilst trying to save to " + choice.getName(), ex); - JOptionPane.showMessageDialog(this, + JOptionPane.showMessageDialog(me, "Error whilst saving current state to " + choice.getName(), "Couldn't save project", JOptionPane.WARNING_MESSAGE); } setProgressBar(null, choice.hashCode()); - + } + }).start(); } } @@ -1254,44 +1310,47 @@ public class Desktop extends jalview.jbgui.GDesktop implements } JPanel progressPanel; - + ArrayList fileLoadingPanels=new ArrayList(); public void startLoading(final String fileName) { if (fileLoadingCount == 0) { - addProgressPanel("Loading File: " + fileName + " "); - + fileLoadingPanels.add(addProgressPanel("Loading File: " + fileName + " ")); } fileLoadingCount++; } - private JProgressBar addProgressPanel(String string) + private JPanel addProgressPanel(String string) { if (progressPanel == null) { - progressPanel = new JPanel(new BorderLayout()); + progressPanel = new JPanel(new GridLayout(1,1)); totalProgressCount = 0; + instance.getContentPane().add(progressPanel, BorderLayout.SOUTH); } + JPanel thisprogress=new JPanel(new BorderLayout(10,5)); JProgressBar progressBar = new JProgressBar(); progressBar.setIndeterminate(true); - progressPanel.add(new JLabel(string), BorderLayout.WEST); + thisprogress.add(new JLabel(string), BorderLayout.WEST); - progressPanel.add(progressBar, BorderLayout.CENTER); - - instance.getContentPane().add(progressPanel, BorderLayout.SOUTH); - totalProgressCount++; - validate(); - return progressBar; + thisprogress.add(progressBar, BorderLayout.CENTER); + progressPanel.add(thisprogress); + ((GridLayout)progressPanel.getLayout()).setRows(((GridLayout)progressPanel.getLayout()).getRows()+1); + ++totalProgressCount; + instance.validate(); + return thisprogress; } int totalProgressCount = 0; - private void removeProgressPanel(JProgressBar progbar) + private void removeProgressPanel(JPanel progbar) { if (progressPanel != null) { progressPanel.remove(progbar); + GridLayout gl = (GridLayout) progressPanel.getLayout(); + gl.setRows(gl.getRows()-1); if (--totalProgressCount < 1) { this.getContentPane().remove(progressPanel); @@ -1306,11 +1365,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements fileLoadingCount--; if (fileLoadingCount < 1) { - if (progressPanel != null) + for (JPanel flp : fileLoadingPanels) { - this.getContentPane().remove(progressPanel); - progressPanel = null; + removeProgressPanel(flp); } + fileLoadingPanels.clear(); fileLoadingCount = 0; } validate(); @@ -1757,7 +1816,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (value == JalviewFileChooser.APPROVE_OPTION) { java.io.File choice = chooser.getSelectedFile(); - JProgressBar progpanel = addProgressPanel("Saving VAMSAS Document to " + JPanel progpanel = addProgressPanel("Saving VAMSAS Document to " + choice.getName()); jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent()); String warnmsg = null; @@ -1791,7 +1850,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } - JProgressBar vamUpdate = null; + JPanel vamUpdate = null; /** * hide vamsas user gui bits when a vamsas document event is being handled. @@ -1927,6 +1986,17 @@ public class Desktop extends jalview.jbgui.GDesktop implements } + /** + * fixes stacking order after a modal dialog to ensure windows that should be on top actually are + */ + public void relayerWindows() + { + if (jvnews!=null && jvnews.isVisible()) + { + jvnews.toFront(); + } + } + protected JMenuItem groovyShell; public void doGroovyCheck() @@ -1986,6 +2056,42 @@ public class Desktop extends jalview.jbgui.GDesktop implements avp.clear(); return afs; } + public AppJmol[] getJmols() + { + JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + + if (frames == null) + { + return null; + } + Vector avp = new Vector(); + try + { + // REVERSE ORDER + for (int i = frames.length - 1; i > -1; i--) + { + if (frames[i] instanceof AppJmol) + { + AppJmol af = (AppJmol) frames[i]; + avp.addElement(af); + } + } + } catch (Exception ex) + { + ex.printStackTrace(); + } + if (avp.size() == 0) + { + return null; + } + AppJmol afs[] = new AppJmol[avp.size()]; + for (int i = 0, j = avp.size(); i < j; i++) + { + afs[i] = (AppJmol) avp.elementAt(i); + } + avp.clear(); + return afs; + } /** * Add Groovy Support to Jalview @@ -2027,7 +2133,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements /** * Progress bars managed by the IProgressIndicator method. */ - private Hashtable progressBars, progressBarHandlers; + private Hashtable progressBars; + private Hashtable progressBarHandlers; /* * (non-Javadoc) @@ -2038,13 +2145,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (progressBars == null) { - progressBars = new Hashtable(); - progressBarHandlers = new Hashtable(); + progressBars = new Hashtable(); + progressBarHandlers = new Hashtable(); } if (progressBars.get(new Long(id)) != null) { - JProgressBar progressPanel = (JProgressBar) progressBars + JPanel progressPanel = progressBars .remove(new Long(id)); if (progressBarHandlers.contains(new Long(id))) { @@ -2165,7 +2272,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements // register PCS handler for desktop. discoverer.addPropertyChangeListener(changeSupport); } - if (Cache.getDefault("SHOW_JWS1_SERVICES", true)) + // JAL-940 - disabled JWS1 service configuration - always start discoverer until we phase out completely + if (true) { (t0 = new Thread(discoverer)).start(); } @@ -2326,4 +2434,5 @@ public class Desktop extends jalview.jbgui.GDesktop implements return wsparamManager; } + }